Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Craig Mautner
2012-09-12 16:18:36 -07:00
committed by Android (Google) Code Review
parent 4f77268c8a c516a5c58f
commit faecd09cb7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/wm/WindowState.java
View File

@@ -806,7 +806,7 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return mViewVisibility == View.GONE return mViewVisibility == View.GONE
|| !mRelayoutCalled || !mRelayoutCalled
|| (atoken == null && mRootToken.hidden) || (atoken == null && mRootToken.hidden)
|| (atoken != null && (atoken.hiddenRequested || atoken.hidden)) || (atoken != null && atoken.hiddenRequested)
|| mAttachedHidden || mAttachedHidden
|| mExiting || mDestroying; || mExiting || mDestroying;
} }