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

Merge "Finish fixed rotation of recents until transition is done" into rvc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2020-06-15 09:43:53 +00:00
committed by Android (Google) Code Review
parent e873ed3290 e291c7d0a7
commit ee5df39e93
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -5647,8 +5647,12 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
}
if (animatingRecents != null && animatingRecents == mFixedRotationLaunchingApp) {
// Because it won't affect display orientation, just finish the transform.
animatingRecents.finishFixedRotationTransform();
// The recents activity should be going to be invisible (switch to another app or
// return to original top). Only clear the top launching record without finishing
// the transform immediately because it won't affect display orientation. And before
// the visibility is committed, the recents activity may perform relayout which may
// cause unexpected configuration change if the rotated configuration is restored.
// The transform will be finished when the transition is done.
setFixedRotationLaunchingAppUnchecked(null);
} else {
// If there is already a launching activity that is not the recents, before its

14
services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java
View File

@@ -349,11 +349,19 @@ public class RecentsAnimationControllerTest extends WindowTestsBase {
assertEquals(Configuration.ORIENTATION_PORTRAIT,
homeActivity.getConfiguration().orientation);
// Home activity won't become top (return to landActivity), so its fixed rotation and the
// top rotated record should be cleared.
// Home activity won't become top (return to landActivity), so the top rotated record should
// be cleared.
mController.cleanupAnimation(REORDER_MOVE_TO_ORIGINAL_POSITION);
assertFalse(homeActivity.hasFixedRotationTransform());
assertFalse(mDefaultDisplay.isFixedRotationLaunchingApp(homeActivity));
assertFalse(mDefaultDisplay.hasTopFixedRotationLaunchingApp());
// The transform should keep until the transition is done, so the restored configuration
// won't be sent to activity and cause unnecessary configuration change.
assertTrue(homeActivity.hasFixedRotationTransform());
// In real case the transition will be executed from RecentsAnimation#finishAnimation.
mDefaultDisplay.mFixedRotationTransitionListener.onAppTransitionFinishedLocked(
homeActivity.token);
assertFalse(homeActivity.hasFixedRotationTransform());
}
@Test