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

Commit f6af5cad authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Clear mDeferredHideWallpaper if wallpaper is being hidden"

parents 6de6dff5 50d45465

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

+6 −0
Original line number Diff line number Diff line
@@ -87,6 +87,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;
@@ -4210,10 +4211,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
@@ -1115,7 +1115,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()) {
@@ -1179,6 +1179,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);

                    }