diff options
| author | Craig Mautner <cmautner@google.com> | 2012-09-12 16:18:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-12 16:18:37 -0700 |
| commit | faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f (patch) | |
| tree | c43308c07c82680eedd79ac09aeea4c996318551 /services | |
| parent | 4f77268c8a75dd89303b0c6bcf6ee02a97a68d1a (diff) | |
| parent | c516a5c58ff505d7c53d79a174aa118f65cac366 (diff) | |
| download | frameworks_base-faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f.zip frameworks_base-faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f.tar.gz frameworks_base-faecd09cb72a78b6ea2dc1d1e16a8e99ab414b6f.tar.bz2 | |
Merge "Only consider hiddenRequested when deciding layout" into jb-mr1-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/WindowState.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowState.java b/services/java/com/android/server/wm/WindowState.java index 478475d..a06ee3b 100644 --- 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; } |