am faecd09c: Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev

* commit 'faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f': Only consider hiddenRequested when deciding layout
2012-09-12 16:21:00 -07:00
parent 208ed52933 faecd09cb7
commit 5f3bce237e
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowState.java
+++ b/services/java/com/android/server/wm/WindowState.java
@@ -806,7 +806,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
        return mViewVisibility == View.GONE
                || !mRelayoutCalled
                || (atoken == null && mRootToken.hidden)
-                || (atoken != null && (atoken.hiddenRequested || atoken.hidden))
+                || (atoken != null && atoken.hiddenRequested)
                || mAttachedHidden
                || mExiting || mDestroying;
    }