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

Merge "Do not skip finishing async rotation by a non-rotation transition" into udc-qpr-dev am: 4b8e8ea3a5

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

Change-Id: If2a41693e640789fe6bc68eba08919502c7588b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Riddle Hsu
2023-07-25 10:36:48 +00:00
committed by Automerger Merge Worker
parent f8175e026f 4b8e8ea3a5
commit d55c003a47
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1935,7 +1935,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
} else if (mFixedRotationLaunchingApp != null && r == null) {
mWmService.mDisplayNotificationController.dispatchFixedRotationFinished(this);
// Keep async rotation controller if the next transition of display is requested.
if (!mTransitionController.isCollecting(this)) {
if (!mTransitionController.hasCollectingRotationChange(this, getRotation())) {
finishAsyncRotationIfPossible();
}
}

11
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -577,6 +577,17 @@ class TransitionController {
return mCollectingTransition != null ? mCollectingTransition.mType : TRANSIT_NONE;
}
/**
* Returns {@code true} if the window container is in the collecting transition, and its
* collected rotation is different from the target rotation.
*/
boolean hasCollectingRotationChange(@NonNull WindowContainer<?> wc, int targetRotation) {
final Transition transition = mCollectingTransition;
if (transition == null || !transition.mParticipants.contains(wc)) return false;
final Transition.ChangeInfo changeInfo = transition.mChanges.get(wc);
return changeInfo != null && changeInfo.mRotation != targetRotation;
}
/**
* @see #requestTransitionIfNeeded(int, int, WindowContainer, WindowContainer, RemoteTransition)
*/

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

@@ -1239,6 +1239,27 @@ public class TransitionTests extends WindowTestsBase {
assertEquals(freeze, controller.shouldFreezeInsetsPosition(w));
}
@Test
public void testFinishRotationControllerWithFixedRotation() {
final ActivityRecord app = new ActivityBuilder(mAtm).setCreateTask(true).build();
mDisplayContent.setFixedRotationLaunchingAppUnchecked(app);
registerTestTransitionPlayer();
mDisplayContent.setLastHasContent();
mDisplayContent.requestChangeTransitionIfNeeded(1 /* changes */, null /* displayChange */);
assertNotNull(mDisplayContent.getAsyncRotationController());
mDisplayContent.setFixedRotationLaunchingAppUnchecked(null);
assertNull("Clear rotation controller if rotation is not changed",
mDisplayContent.getAsyncRotationController());
mDisplayContent.setFixedRotationLaunchingAppUnchecked(app);
assertNotNull(mDisplayContent.getAsyncRotationController());
mDisplayContent.getDisplayRotation().setRotation(
mDisplayContent.getWindowConfiguration().getRotation() + 1);
mDisplayContent.setFixedRotationLaunchingAppUnchecked(null);
assertNotNull("Keep rotation controller if rotation will be changed",
mDisplayContent.getAsyncRotationController());
}
@Test
public void testDeferRotationForTransientLaunch() {
final TestTransitionPlayer player = registerTestTransitionPlayer();