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

Commit 8c7b9a08 authored by Tiger Huang's avatar Tiger Huang Committed by android-build-merger
Browse files

Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden" into pi-dev 

am: b6c84d11

Change-Id: I9d1a24f1adf5c3dd192c26c563e0c56cf1651840
parents 33c4b1ef b6c84d11

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

+6 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS; 
import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS_LIGHT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_INPUT_METHOD;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYOUT_REPEATS;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ORIENTATION;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_POWER;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_RESIZE;
@@ -4248,10 +4249,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        }

        if (!mWinAnimator.mLastHidden || wasDeferred) {

            mWinAnimator.hide(reason);

            getDisplayContent().mWallpaperController.mDeferredHideWallpaper = null;

            dispatchWallpaperVisibility(false);

            final DisplayContent displayContent = getDisplayContent();

            if (displayContent != null) {

                displayContent.pendingLayoutChanges |= FINISH_LAYOUT_REDO_WALLPAPER;

                if (DEBUG_LAYOUT_REPEATS) {

                    mService.mWindowPlacerLocked.debugLayoutRepeats("hideWallpaperWindow " + this,

                            displayContent.pendingLayoutChanges);

                }

            }

        }

    }

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

+6 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ class WindowStateAnimator { 


        setSurfaceBoundariesLocked(recoveringMemory);



        if (mIsWallpaper && !mWin.mWallpaperVisible) {

        if (mIsWallpaper && !w.mWallpaperVisible) {

            // Wallpaper is no longer visible and there is no wp target => hide it.

            hide("prepareSurfaceLocked");

        } else if (w.isParentWindowHidden() || !w.isOnScreen()) {
@@ -1190,6 +1190,11 @@ class WindowStateAnimator { 
                        // LogicalDisplay.

                        mAnimator.setPendingLayoutChanges(w.getDisplayId(),

                                FINISH_LAYOUT_REDO_ANIM);

                        if (DEBUG_LAYOUT_REPEATS) {

                            mService.mWindowPlacerLocked.debugLayoutRepeats(

                                    "showSurfaceRobustlyLocked " + w,

                                    mAnimator.getPendingLayoutChanges(w.getDisplayId()));

                        }

                    } else {

                        w.setOrientationChanging(false);

                    }