diff options
| author | Craig Mautner <cmautner@google.com> | 2012-07-02 17:22:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-07-02 17:22:40 -0700 |
| commit | c751e37c4fea4aecb7cc8859d8ac9a6e2a8ce93f (patch) | |
| tree | 492d6b1454c5f1a904e62851ba6a00a180d85ec3 /services | |
| parent | 80059d6c1b60e9920b7ae133808c989b4d3fa8fe (diff) | |
| parent | cc93507124855591be40af55a94deeb33d74e719 (diff) | |
| download | frameworks_base-c751e37c4fea4aecb7cc8859d8ac9a6e2a8ce93f.zip frameworks_base-c751e37c4fea4aecb7cc8859d8ac9a6e2a8ce93f.tar.gz frameworks_base-c751e37c4fea4aecb7cc8859d8ac9a6e2a8ce93f.tar.bz2 | |
am cc935071: Merge "DO NOT MERGE Set force hiding differently" into jb-dev
* commit 'cc93507124855591be40af55a94deeb33d74e719':
DO NOT MERGE Set force hiding differently
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/WindowAnimator.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index fdd8aab..db3b2bd 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -3,6 +3,7 @@ package com.android.server.wm; import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER; +import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; import static com.android.server.wm.WindowManagerService.LayoutFields.SET_UPDATE_ROTATION; import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_MAY_CHANGE; @@ -278,7 +279,7 @@ public class WindowAnimator { } mService.mFocusMayChange = true; } - if (win.isReadyForDisplay() && !winAnimator.isAnimating()) { + if (win.isReadyForDisplay() && winAnimator.mAnimationIsEntrance) { mForceHiding = true; } if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG, @@ -292,7 +293,8 @@ public class WindowAnimator { + " anim=" + win.mWinAnimator.mAnimation); } else if (mPolicy.canBeForceHidden(win, win.mAttrs)) { final boolean changed; - if (mForceHiding && !winAnimator.isAnimating()) { + if (mForceHiding && (!winAnimator.isAnimating() + || (winAnimator.mAttrFlags & FLAG_SHOW_WHEN_LOCKED) == 0)) { changed = win.hideLw(false, false); if (WindowManagerService.DEBUG_VISIBILITY && changed) Slog.v(TAG, "Now policy hidden: " + win); |