diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-08 15:24:22 -0800 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2013-11-08 15:36:23 -0800 |
| commit | a8ee262c04749db4f32f73d2b9e7f58989c4638b (patch) | |
| tree | a42dc5ce74eaba10c5022aa1905204a2ef44d4e1 /services/java/com/android/server/wm/WindowManagerService.java | |
| parent | 105b9b05041ea6f1109d961d548f3dde2bd69501 (diff) | |
Fix a couple of issues with mOpeningApps.
In setAppVisibility add wtoken to mOpeningApps even if the requested
visibility already matches requestedHidden. When Keyguard hides an app
requestedHidden will mismatch and mOpeningApps will end up empty where
it should have the app that will become visible.
Add mAnimateWallpaperWithTarget = true to another situation where
wallpaper animation needs it.
Fixes bug 11570753.
Change-Id: I70b93bbb580386eb912613f0ce11e582eff8c449
Diffstat (limited to 'services/java/com/android/server/wm/WindowManagerService.java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowManagerService.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 55b0b3acf56d..818cfecde25a 100644 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -4306,10 +4306,6 @@ public class WindowManagerService extends IWindowManager.Stub // If we are preparing an app transition, then delay changing // the visibility of this token until we execute that transition. if (okToDisplay() && mAppTransition.isTransitionSet()) { - // Already in requested state, don't do anything more. - if (wtoken.hiddenRequested != visible) { - return; - } wtoken.hiddenRequested = !visible; if (!wtoken.startingDisplayed) { @@ -8526,6 +8522,7 @@ public class WindowManagerService extends IWindowManager.Stub // We are transitioning from an activity with // a wallpaper to one without. transit = AppTransition.TRANSIT_WALLPAPER_CLOSE; + mAnimateWallpaperWithTarget = true; if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, "New transit away from wallpaper: " + transit); } else if (mWallpaperTarget != null && mWallpaperTarget.isVisibleLw()) { |