diff options
| author | 2022-07-01 12:52:57 +0000 | |
|---|---|---|
| committer | 2022-07-01 12:52:57 +0000 | |
| commit | f2c5ecb10c448c113e151e19e364bdaf57adc378 (patch) | |
| tree | b7cb5d3c40fa5732042a2e27cc558b3ffdafcb7e | |
| parent | c652f395c6392d5e196393f1535e58ae58f9ab16 (diff) | |
| parent | 9d85462b823e471152e3ceb9140fa1dcd7cc6b81 (diff) | |
Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev am: 404a138e8e am: 9d85462b82
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19129428
Change-Id: I645708063741247de10dee264049363734194a26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/wm/AsyncRotationController.java | 2 | ||||
| -rw-r--r-- | services/tests/wmtests/src/com/android/server/wm/TransitionTests.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/AsyncRotationController.java b/services/core/java/com/android/server/wm/AsyncRotationController.java index e3de18b1ebc7..2e1d3b1643ac 100644 --- a/services/core/java/com/android/server/wm/AsyncRotationController.java +++ b/services/core/java/com/android/server/wm/AsyncRotationController.java @@ -357,7 +357,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume * or seamless transformation in a rotated display. */ boolean shouldFreezeInsetsPosition(WindowState w) { - return mTransitionOp == OP_APP_SWITCH && w.mTransitionController.inTransition() + return mTransitionOp != OP_LEGACY && w.mTransitionController.inTransition() && isTargetToken(w.mToken); } diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java index 53595a5b066f..67e0a357cc01 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java @@ -686,6 +686,7 @@ public class TransitionTests extends WindowTestsBase { assertTrue(ime.mToken.inTransition()); assertTrue(task.inTransition()); assertTrue(asyncRotationController.isTargetToken(decorToken)); + assertTrue(asyncRotationController.shouldFreezeInsetsPosition(navBar)); screenDecor.setOrientationChanging(false); // Status bar finishes drawing before the start transaction. Its fade-in animation will be |