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

Merge "Do not run rotation animation when folding/unfolding" into sc-v2-dev am: 56b9431082

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

Change-Id: Ia54c1c6ff3692b0b87ce4ada2630ce74197f5d7d
This commit is contained in:
Nick Chameyev
2021-10-20 17:14:13 +00:00
committed by Automerger Merge Worker
parent 1c3b2fa375 56b9431082
commit 6bcc065de2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -5836,7 +5836,9 @@ public class WindowManagerService extends IWindowManager.Stub
return;
}
if (!displayContent.isReady() || !mPolicy.isScreenOn() || !displayContent.okToAnimate()) {
if (!displayContent.isReady() || !displayContent.getDisplayPolicy().isScreenOnFully()
|| displayContent.getDisplayInfo().state == Display.STATE_OFF
|| !displayContent.okToAnimate()) {
// No need to freeze the screen before the display is ready, if the screen is off,
// or we can't currently animate.
return;

5
services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
View File

@@ -1752,6 +1752,11 @@ public class ActivityRecordTests extends WindowTestsBase {
anyInt() /* orientation */, anyInt() /* lastRotation */);
// Set to visible so the activity can freeze the screen.
activity.setVisibility(true);
// Update the display policy to make the screen fully turned on so the freeze is allowed
display.getDisplayPolicy().screenTurnedOn(null);
display.getDisplayPolicy().finishKeyguardDrawn();
display.getDisplayPolicy().finishWindowsDrawn();
display.getDisplayPolicy().finishScreenTurningOn();
display.rotateInDifferentOrientationIfNeeded(activity);
display.setFixedRotationLaunchingAppUnchecked(activity);