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

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

Change-Id: I320ac336964596f0af62f6bbc1925d6a7d719f90
This commit is contained in:
Riddle Hsu
2021-08-11 03:52:05 +00:00
committed by Automerger Merge Worker

View File

@@ -1593,8 +1593,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
// If the transition has not started yet, the activity must be the top. // If the transition has not started yet, the activity must be the top.
return false; return false;
} }
if (mLastWallpaperVisible && r.windowsCanBeWallpaperTarget()) { if (mLastWallpaperVisible && r.windowsCanBeWallpaperTarget()
// Use normal rotation animation for orientation change of visible wallpaper. && 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; return false;
} }
final int rotation = rotationForActivityInDifferentOrientation(r); final int rotation = rotationForActivityInDifferentOrientation(r);