Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20581ebc authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

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

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

Change-Id: Ic9c6cd0d7aa10957f82b428af8a15e9a0a7d0395
parents aceaca30 11d21265

services/core/java/com/android/server/wm/DisplayContent.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -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);