Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Freeze insets position for shell transition rotation" into tm-qpr-dev am: 404a138e8e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19129428

Change-Id: Ia6489f0c02f3c1cf2f28a960715a1a8224be5613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2022-07-01 12:46:46 +00:00
committed by Automerger Merge Worker
parent cdfc1e6f9a 404a138e8e
commit 9d85462b82
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/AsyncRotationController.java
View File

@@ -357,7 +357,7 @@ class AsyncRotationController extends FadeAnimationController implements Consume
* or seamless transformation in a rotated display. * or seamless transformation in a rotated display.
*/ */
boolean shouldFreezeInsetsPosition(WindowState w) { boolean shouldFreezeInsetsPosition(WindowState w) {
return mTransitionOp == OP_APP_SWITCH && w.mTransitionController.inTransition() return mTransitionOp != OP_LEGACY && w.mTransitionController.inTransition()
&& isTargetToken(w.mToken); && isTargetToken(w.mToken);
} }

1
services/tests/wmtests/src/com/android/server/wm/TransitionTests.java
View File

@@ -683,6 +683,7 @@ public class TransitionTests extends WindowTestsBase {
assertTrue(ime.mToken.inTransition()); assertTrue(ime.mToken.inTransition());
assertTrue(task.inTransition()); assertTrue(task.inTransition());
assertTrue(asyncRotationController.isTargetToken(decorToken)); assertTrue(asyncRotationController.isTargetToken(decorToken));
assertTrue(asyncRotationController.shouldFreezeInsetsPosition(navBar));
screenDecor.setOrientationChanging(false); screenDecor.setOrientationChanging(false);
// Status bar finishes drawing before the start transaction. Its fade-in animation will be // Status bar finishes drawing before the start transaction. Its fade-in animation will be