commit b0c6ad697cfa3dff35aab8e8ced42debed0a2678
author Riddle Hsu <riddlehsu@google.com> Wed Jul 19 12:11:06 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 19 12:11:06 2023 +0000
tree fca7b2dfffa543ea3cbef46d9e8e6afc804b389d
parent 4ea2ef660e88ee19b37d2d2268a635f6a8d0a470
parent ab65c569d4d1084bc16340d317d6be1630048970

Merge "Skip display rotation animation for non-change type transition" into udc-qpr-dev

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
index e52fd00..dc78c9b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultTransitionHandler.java
@@ -407,7 +407,7 @@
                             change.getEndAbsBounds().width(), change.getEndAbsBounds().height());
                 }
                 // Rotation change of independent non display window container.
-                if (change.getParent() == null
+                if (change.getParent() == null && !change.hasFlags(FLAG_IS_DISPLAY)
                         && change.getStartRotation() != change.getEndRotation()) {
                     startRotationAnimation(startTransaction, change, info,
                             ROTATION_ANIMATION_ROTATE, animations, onAnimFinish);