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

Craig Mautner · Android (Google) Code Review · commit faecd09cb72a · 2012-09-12T16:18:37.000-07:00
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java
@@ -806,7 +806,7 @@ public boolean isGoneForLayoutLw() {
         return mViewVisibility == View.GONE
                 || !mRelayoutCalled
                 || (atoken == null && mRootToken.hidden)
-                || (atoken != null && (atoken.hiddenRequested || atoken.hidden))
+                || (atoken != null && atoken.hiddenRequested)
                 || mAttachedHidden
                 || mExiting || mDestroying;
     }

Original file line number	Diff line number	Diff line change
`@@ -806,7 +806,7 @@ public boolean isGoneForLayoutLw() {`
`806`	`806`	`return mViewVisibility == View.GONE`
`807`	`807`	`\|\| !mRelayoutCalled`
`808`	`808`	`\|\| (atoken == null && mRootToken.hidden)`
`809`		`- \|\| (atoken != null && (atoken.hiddenRequested \|\| atoken.hidden))`
	`809`	`+ \|\| (atoken != null && atoken.hiddenRequested)`
`810`	`810`	`\|\| mAttachedHidden`
`811`	`811`	`\|\| mExiting \|\| mDestroying;`
`812`	`812`	`}`