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

Merge "Allow to use fixed rotation if recents is animating" into sc-dev am: 58c7e9499c am: 11d2126532 am: 8ddf7624d1

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

Change-Id: I18b47090a750a77b09f825782be8d573ecb7b6bd
This commit is contained in:
Riddle Hsu
2021-08-11 03:58:25 +00:00
committed by Automerger Merge Worker
parent 2617566118 8ddf7624d1
commit 4698f0f3b5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1629,8 +1629,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// If the transition has not started yet, the activity must be the top.
return false;
}
if (mLastWallpaperVisible && r.windowsCanBeWallpaperTarget()) {
// Use normal rotation animation for orientation change of visible wallpaper.
if (mLastWallpaperVisible && r.windowsCanBeWallpaperTarget()
&& mFixedRotationTransitionListener.mAnimatingRecents == null) {
// Use normal rotation animation for orientation change of visible wallpaper if recents
// animation is not running (it may be swiping to home).
return false;
}
final int rotation = rotationForActivityInDifferentOrientation(r);