diff options
author | Justin Ho <justinho@google.com> | 2012-01-19 15:43:19 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-19 15:43:19 -0800 |
commit | 820b45c0a21980a43532b9fb9823f8aa08c64a15 (patch) | |
tree | 702c1d08450476567130bde508e2d8a822556932 /services | |
parent | 4e552533ea049970b54c1cdba5afb7d13496c3c1 (diff) | |
parent | 170997a519ce79e93e4f6984e9663232475ce92c (diff) | |
download | frameworks_base-820b45c0a21980a43532b9fb9823f8aa08c64a15.zip frameworks_base-820b45c0a21980a43532b9fb9823f8aa08c64a15.tar.gz frameworks_base-820b45c0a21980a43532b9fb9823f8aa08c64a15.tar.bz2 |
Merge "DO NOT MERGE Revert "Fix issue #5823276: home repaints after full-screen app is exited"" into ics-mr1
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 32 | ||||
-rw-r--r-- | services/java/com/android/server/wm/WindowState.java | 10 |
2 files changed, 14 insertions, 28 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 4dcf59b..9fb064f 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -7391,11 +7391,8 @@ public class WindowManagerService extends IWindowManager.Stub final int N = mWindows.size(); int i; - if (DEBUG_LAYOUT) { - Slog.v(TAG, "-------------------------------------"); - Slog.v(TAG, "performLayout: needed=" - + mLayoutNeeded + " dw=" + dw + " dh=" + dh); - } + if (DEBUG_LAYOUT) Slog.v(TAG, "performLayout: needed=" + + mLayoutNeeded + " dw=" + dw + " dh=" + dh); mPolicy.beginLayoutLw(dw, dh, mRotation); @@ -7412,20 +7409,19 @@ public class WindowManagerService extends IWindowManager.Stub // Don't do layout of a window if it is not visible, or // soon won't be visible, to avoid wasting time and funky // changes while a window is animating away. - final boolean gone = win.isGoneForLayoutLw(); + final AppWindowToken atoken = win.mAppToken; + final boolean gone = win.mViewVisibility == View.GONE + || !win.mRelayoutCalled + || (atoken == null && win.mRootToken.hidden) + || (atoken != null && atoken.hiddenRequested) + || win.mAttachedHidden + || win.mExiting || win.mDestroying; if (DEBUG_LAYOUT && !win.mLayoutAttached) { - Slog.v(TAG, "1ST PASS " + win + Slog.v(TAG, "First pass " + win + ": gone=" + gone + " mHaveFrame=" + win.mHaveFrame + " mLayoutAttached=" + win.mLayoutAttached); - final AppWindowToken atoken = win.mAppToken; - if (gone) Slog.v(TAG, " GONE: mViewVisibility=" - + win.mViewVisibility + " mRelayoutCalled=" - + win.mRelayoutCalled + " hidden=" - + win.mRootToken.hidden + " hiddenRequested=" - + (atoken != null && atoken.hiddenRequested) - + " mAttachedHidden=" + win.mAttachedHidden); - else Slog.v(TAG, " VIS: mViewVisibility=" + if (gone) Slog.v(TAG, " (mViewVisibility=" + win.mViewVisibility + " mRelayoutCalled=" + win.mRelayoutCalled + " hidden=" + win.mRootToken.hidden + " hiddenRequested=" @@ -7447,7 +7443,7 @@ public class WindowManagerService extends IWindowManager.Stub win.prelayout(); mPolicy.layoutWindowLw(win, win.mAttrs, null); win.mLayoutSeq = seq; - if (DEBUG_LAYOUT) Slog.v(TAG, " LAYOUT: mFrame=" + if (DEBUG_LAYOUT) Slog.v(TAG, "-> mFrame=" + win.mFrame + " mContainingFrame=" + win.mContainingFrame + " mDisplayFrame=" + win.mDisplayFrame); @@ -7465,7 +7461,7 @@ public class WindowManagerService extends IWindowManager.Stub WindowState win = mWindows.get(i); if (win.mLayoutAttached) { - if (DEBUG_LAYOUT) Slog.v(TAG, "2ND PASS " + win + if (DEBUG_LAYOUT) Slog.v(TAG, "Second pass " + win + " mHaveFrame=" + win.mHaveFrame + " mViewVisibility=" + win.mViewVisibility + " mRelayoutCalled=" + win.mRelayoutCalled); @@ -7483,7 +7479,7 @@ public class WindowManagerService extends IWindowManager.Stub win.prelayout(); mPolicy.layoutWindowLw(win, win.mAttrs, win.mAttachedWindow); win.mLayoutSeq = seq; - if (DEBUG_LAYOUT) Slog.v(TAG, " LAYOUT: mFrame=" + if (DEBUG_LAYOUT) Slog.v(TAG, "-> mFrame=" + win.mFrame + " mContainingFrame=" + win.mContainingFrame + " mDisplayFrame=" + win.mDisplayFrame); diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 794515b..75bda41 100644 --- a/services/java/com/android/server/wm/WindowState.java +++ b/services/java/com/android/server/wm/WindowState.java @@ -1444,16 +1444,6 @@ final class WindowState implements WindowManagerPolicy.WindowState { || mAnimating); } - public boolean isGoneForLayoutLw() { - final AppWindowToken atoken = mAppToken; - return mViewVisibility == View.GONE - || !mRelayoutCalled - || (atoken == null && mRootToken.hidden) - || (atoken != null && (atoken.hiddenRequested || atoken.hidden)) - || mAttachedHidden - || mExiting || mDestroying; - } - /** * Returns true if the window has a surface that it has drawn a * complete UI in to. |