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

Commit 8470ad6e authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Fix letterbox insets when starting app" into pi-dev 

am: 1a6051a8

Change-Id: Ie5f6f6a1372bf6a563a700a74a6fcc41325e616c
parents af76f5eb 1a6051a8

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+3 −0
Original line number Diff line number Diff line
@@ -407,7 +407,10 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
        /**

         * Returns true if this window has been shown on screen at some time in

         * the past.  Must be called with the window manager lock held.

         *

         * @deprecated Use {@link #isDrawnLw} or any of the other drawn/visibility methods.

         */

        @Deprecated

        public boolean hasDrawnLw();



        /**

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

+1 −1
Original line number Diff line number Diff line
@@ -1485,7 +1485,7 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree 
        if (w == null || winHint != null && w != winHint) {

            return;

        }

        final boolean surfaceReady = w.hasDrawnLw()  // Regular case

        final boolean surfaceReady = w.isDrawnLw()  // Regular case

                || w.mWinAnimator.mSurfaceDestroyDeferred  // The preserved surface is still ready.

                || w.isDragResizeChanged();  // Waiting for relayoutWindow to call preserveSurface.

        final boolean needsLetterbox = w.isLetterboxedAppWindow() && fillsParent() && surfaceReady;