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

am da652f6e: Merge "Revert change to correct animations." into jb-dev

Browse Source 
* commit 'da652f6e51e5b255019ac020d56e262e477c2a46':
  Revert change to correct animations.
This commit is contained in:
Craig Mautner
2012-06-03 00:59:17 -07:00
committed by Android Git Automerger
parent 0962d3729b da652f6e51
commit 547be2fc32
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8078,7 +8078,7 @@ public class WindowManagerService extends IWindowManager.Stub
} }
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"New transit: " + transit); "New transit: " + transit);
} else if ((oldWallpaper != null) && (oldWallpaper != mWallpaperTarget)) { } else if (oldWallpaper != null) {
// We are transitioning from an activity with // We are transitioning from an activity with
// a wallpaper to one without. // a wallpaper to one without.
transit = WindowManagerPolicy.TRANSIT_WALLPAPER_CLOSE; transit = WindowManagerPolicy.TRANSIT_WALLPAPER_CLOSE;