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

am 86b06976: am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev

Browse Source 
* commit '86b06976e7d93772422c85c15d08ec1f00ebbcfc':
  Fix a couple of issues with mOpeningApps.
This commit is contained in:
Craig Mautner
2013-11-11 10:07:25 -08:00
committed by Android Git Automerger
parent 6492c0f3af 86b06976e7
commit c1c5e37cf6
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/java/com/android/server/wm/WindowManagerService.java
View File

@@ -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()) {