diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-11 10:04:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-11 10:04:46 -0800 |
| commit | 86b06976e7d93772422c85c15d08ec1f00ebbcfc (patch) | |
| tree | fefef9fee22393d2a16e7428194f3a7c4eeea379 | |
| parent | 22a9710608d47747f9b834aa2a6b377bf529ad33 (diff) | |
| parent | 45bf2815158cb98130fff120b34ad05f5a54b8f8 (diff) | |
| download | frameworks_base-86b06976e7d93772422c85c15d08ec1f00ebbcfc.zip frameworks_base-86b06976e7d93772422c85c15d08ec1f00ebbcfc.tar.gz frameworks_base-86b06976e7d93772422c85c15d08ec1f00ebbcfc.tar.bz2 | |
am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev
* commit '45bf2815158cb98130fff120b34ad05f5a54b8f8':
Fix a couple of issues with mOpeningApps.
| -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 55b0b3a..818cfec 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()) { |