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

Commit f5e9c0b0 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: 58c7e949 

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

Change-Id: I69e13f1f48460db6e0409b1ff50b2b713e4fbfa9
parents 0346e572 58c7e949

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

+4 −2
Original line number 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.

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