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

Commit 08cec4ee authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a5853595: am 47163685: Merge "Another attempt at issue #5823276: home... 

am a5853595: am 47163685: Merge "Another attempt at issue #5823276: home repaints after full-screen app is exited" into ics-mr1

* commit 'a5853595':
  Another attempt at issue #5823276: home repaints after full-screen app is exited
parents 8c190f76 a5853595

services/java/com/android/server/wm/WindowManagerService.java

+13 −4
Original line number Diff line number Diff line
@@ -2543,8 +2543,12 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (win == null) {

                return 0;

            }

            if (win.mRequestedWidth != requestedWidth

                    || win.mRequestedHeight != requestedHeight) {

                win.mLayoutNeeded = true;

                win.mRequestedWidth = requestedWidth;

                win.mRequestedHeight = requestedHeight;

            }

            if (attrs != null && seq == win.mSeq) {

                win.mSystemUiVisibility = systemUiVisibility;

            }
@@ -2565,6 +2569,9 @@ public class WindowManagerService extends IWindowManager.Stub 
                }

                flagChanges = win.mAttrs.flags ^= attrs.flags;

                attrChanges = win.mAttrs.copyFrom(attrs);

                if ((attrChanges&WindowManager.LayoutParams.LAYOUT_CHANGED) != 0) {

                    win.mLayoutNeeded = true;

                }

            }



            if (DEBUG_LAYOUT) Slog.v(TAG, "Relayout " + win + ": " + win.mAttrs);
@@ -7460,12 +7467,13 @@ public class WindowManagerService extends IWindowManager.Stub 
            // if they want.  (We do the normal layout for INVISIBLE

            // windows, since that means "perform layout as normal,

            // just don't display").

            if (!gone || !win.mHaveFrame) {

            if (!gone || !win.mHaveFrame || win.mLayoutNeeded) {

                if (!win.mLayoutAttached) {

                    if (initial) {

                        //Slog.i(TAG, "Window " + this + " clearing mContentChanged - initial");

                        win.mContentChanged = false;

                    }

                    win.mLayoutNeeded = false;

                    win.prelayout();

                    mPolicy.layoutWindowLw(win, win.mAttrs, null);

                    win.mLayoutSeq = seq;
@@ -7497,11 +7505,12 @@ public class WindowManagerService extends IWindowManager.Stub 
                // windows, since that means "perform layout as normal,

                // just don't display").

                if ((win.mViewVisibility != View.GONE && win.mRelayoutCalled)

                        || !win.mHaveFrame) {

                        || !win.mHaveFrame || win.mLayoutNeeded) {

                    if (initial) {

                        //Slog.i(TAG, "Window " + this + " clearing mContentChanged - initial");

                        win.mContentChanged = false;

                    }

                    win.mLayoutNeeded = false;

                    win.prelayout();

                    mPolicy.layoutWindowLw(win, win.mAttrs, win.mAttachedWindow);

                    win.mLayoutSeq = seq;

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

+10 −3
Original line number Diff line number Diff line
@@ -238,6 +238,12 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    // we can give the window focus before waiting for the relayout.

    boolean mRelayoutCalled;



    // If the application has called relayout() with changes that can

    // impact its window's size, we need to perform a layout pass on it

    // even if it is not currently visible for layout.  This is set

    // when in that case until the layout is done.

    boolean mLayoutNeeded;



    // This is set after the Surface has been created but before the

    // window has been drawn.  During this time the surface is hidden.

    boolean mDrawPending;
@@ -1449,7 +1455,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return mViewVisibility == View.GONE

                || !mRelayoutCalled

                || (atoken == null && mRootToken.hidden)

                || (atoken != null && atoken.hiddenRequested)

                || (atoken != null && (atoken.hiddenRequested || atoken.hidden))

                || mAttachedHidden

                || mExiting || mDestroying;

    }
@@ -1728,8 +1734,9 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
                    pw.print(mPolicyVisibilityAfterAnim);

                    pw.print(" mAttachedHidden="); pw.println(mAttachedHidden);

        }

        if (!mRelayoutCalled) {

            pw.print(prefix); pw.print("mRelayoutCalled="); pw.println(mRelayoutCalled);

        if (!mRelayoutCalled || mLayoutNeeded) {

            pw.print(prefix); pw.print("mRelayoutCalled="); pw.print(mRelayoutCalled);

                    pw.print(" mLayoutNeeded="); pw.println(mLayoutNeeded);

        }

        if (mSurfaceResized || mSurfaceDestroyDeferred) {

            pw.print(prefix); pw.print("mSurfaceResized="); pw.print(mSurfaceResized);