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

Merge "Only fade window token on exact rotation change" into sc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2021-05-18 15:03:06 +00:00
committed by Android (Google) Code Review
parent 6ebcfff707 89f313fce1
commit ea3bffe575
2 changed files with 3 additions and 0 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

@@ -2998,6 +2998,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// Hide the windows which are not significant in rotation animation. So that the windows // Hide the windows which are not significant in rotation animation. So that the windows
// don't need to block the unfreeze time. // don't need to block the unfreeze time.
if (screenRotationAnimation != null && screenRotationAnimation.hasScreenshot() if (screenRotationAnimation != null && screenRotationAnimation.hasScreenshot()
// Do not fade for freezing without rotation change.
&& mDisplayRotation.getRotation() != getWindowConfiguration().getRotation()
&& mFadeRotationAnimationController == null) { && mFadeRotationAnimationController == null) {
startFadeRotationAnimation(false /* shouldDebounce */); startFadeRotationAnimation(false /* shouldDebounce */);
} }

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

@@ -1275,6 +1275,7 @@ public class DisplayContentTests extends WindowTestsBase {
// Assume that the display rotation is changed so it is frozen in preparation for animation. // Assume that the display rotation is changed so it is frozen in preparation for animation.
doReturn(true).when(rotationAnim).hasScreenshot(); doReturn(true).when(rotationAnim).hasScreenshot();
mWm.mDisplayFrozen = true; mWm.mDisplayFrozen = true;
displayContent.getDisplayRotation().setRotation((displayContent.getRotation() + 1) % 4);
displayContent.setRotationAnimation(rotationAnim); displayContent.setRotationAnimation(rotationAnim);
// The fade rotation animation also starts to hide some non-app windows. // The fade rotation animation also starts to hide some non-app windows.
assertNotNull(displayContent.getFadeRotationAnimationController()); assertNotNull(displayContent.getFadeRotationAnimationController());