Merge "Allow to use fixed rotation if recents is animating" into sc-dev

This commit is contained in:
Riddle Hsu
2021-08-11 03:51:48 +00:00
committed by Android (Google) Code Review

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.
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);