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

Commit 9562451d authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Do not unminimize after rotate when minimized getting wrong transition"... 

Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev am: 97960fbf
am: f61883ca

Change-Id: I5a39bc6661ea9ec378d904b6002471e4d4a0866d
parents 62719b1a f61883ca

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

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import static com.android.server.wm.AppTransition.TRANSIT_FLAG_KEYGUARD_GOING_AW 
import static com.android.server.wm.AppTransition.TRANSIT_FLAG_KEYGUARD_GOING_AWAY_WITH_WALLPAPER;

import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_GOING_AWAY;

import static com.android.server.wm.AppTransition.TRANSIT_KEYGUARD_GOING_AWAY_ON_WALLPAPER;

import static com.android.server.wm.AppTransition.TRANSIT_NONE;

import static com.android.server.wm.AppTransition.TRANSIT_TASK_CLOSE;

import static com.android.server.wm.AppTransition.TRANSIT_TASK_IN_PLACE;

import static com.android.server.wm.AppTransition.TRANSIT_TASK_OPEN;
@@ -580,6 +581,11 @@ class WindowSurfacePlacer { 


    private int maybeUpdateTransitToWallpaper(int transit, boolean openingAppHasWallpaper,

            boolean closingAppHasWallpaper) {

        // Given no app transition pass it through instead of a wallpaper transition

        if (transit == TRANSIT_NONE) {

            return TRANSIT_NONE;

        }



        // if wallpaper is animating in or out set oldWallpaper to null else to wallpaper

        final WindowState wallpaperTarget = mWallpaperControllerLocked.getWallpaperTarget();

        final WindowState oldWallpaper = mWallpaperControllerLocked.isWallpaperTargetAnimating()