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

am ab886f58: Don\'t do closing animation on an opening app.

Browse Source 
* commit 'ab886f588d4086214e66eed548ea3edd77f8d2ba':
  Don't do closing animation on an opening app.
This commit is contained in:
Daniel Sandler
2012-06-04 14:09:36 -07:00
committed by Android Git Automerger
parent 78f04a364f ab886f588d
commit 04b2a978a5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3258,13 +3258,15 @@ public class WindowManagerService extends IWindowManager.Stub
if (mNextAppTransitionType == ActivityOptions.ANIM_CUSTOM) { if (mNextAppTransitionType == ActivityOptions.ANIM_CUSTOM) {
a = loadAnimation(mNextAppTransitionPackage, enter ? a = loadAnimation(mNextAppTransitionPackage, enter ?
mNextAppTransitionEnter : mNextAppTransitionExit); mNextAppTransitionEnter : mNextAppTransitionExit);
if (DEBUG_ANIM) Slog.v(TAG, "applyAnimation: wtoken=" + wtoken if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,
"applyAnimation: wtoken=" + wtoken
+ " anim=" + a + " nextAppTransition=ANIM_CUSTOM" + " anim=" + a + " nextAppTransition=ANIM_CUSTOM"
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " Callers " + Debug.getCallers(3));
} else if (mNextAppTransitionType == ActivityOptions.ANIM_SCALE_UP) { } else if (mNextAppTransitionType == ActivityOptions.ANIM_SCALE_UP) {
a = createScaleUpAnimationLocked(transit, enter); a = createScaleUpAnimationLocked(transit, enter);
initialized = true; initialized = true;
if (DEBUG_ANIM) Slog.v(TAG, "applyAnimation: wtoken=" + wtoken if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,
"applyAnimation: wtoken=" + wtoken
+ " anim=" + a + " nextAppTransition=ANIM_SCALE_UP" + " anim=" + a + " nextAppTransition=ANIM_SCALE_UP"
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " Callers " + Debug.getCallers(3));
} else if (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL || } else if (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL ||
@@ -3273,7 +3275,7 @@ public class WindowManagerService extends IWindowManager.Stub
a = createThumbnailAnimationLocked(transit, enter, false, delayed); a = createThumbnailAnimationLocked(transit, enter, false, delayed);
initialized = true; initialized = true;
if (DEBUG_ANIM) { if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) {
String animName = delayed ? "ANIM_THUMBNAIL_DELAYED" : "ANIM_THUMBNAIL"; String animName = delayed ? "ANIM_THUMBNAIL_DELAYED" : "ANIM_THUMBNAIL";
Slog.v(TAG, "applyAnimation: wtoken=" + wtoken Slog.v(TAG, "applyAnimation: wtoken=" + wtoken
+ " anim=" + a + " nextAppTransition=" + animName + " anim=" + a + " nextAppTransition=" + animName
@@ -3334,7 +3336,8 @@ public class WindowManagerService extends IWindowManager.Stub
break; break;
} }
a = animAttr != 0 ? loadAnimation(lp, animAttr) : null; a = animAttr != 0 ? loadAnimation(lp, animAttr) : null;
if (DEBUG_ANIM) Slog.v(TAG, "applyAnimation: wtoken=" + wtoken if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,
"applyAnimation: wtoken=" + wtoken
+ " anim=" + a + " anim=" + a
+ " animAttr=0x" + Integer.toHexString(animAttr) + " animAttr=0x" + Integer.toHexString(animAttr)
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " Callers " + Debug.getCallers(3));
@@ -8042,6 +8045,7 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_APP_TRANSITIONS) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,
"New wallpaper target=" + mWallpaperTarget "New wallpaper target=" + mWallpaperTarget
+ ", oldWallpaper=" + oldWallpaper
+ ", lower target=" + mLowerWallpaperTarget + ", lower target=" + mLowerWallpaperTarget
+ ", upper target=" + mUpperWallpaperTarget); + ", upper target=" + mUpperWallpaperTarget);
int foundWallpapers = 0; int foundWallpapers = 0;
@@ -8108,7 +8112,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) { } else if ((oldWallpaper != null) && !mOpeningApps.contains(oldWallpaper.mAppToken)) {
// 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;
@@ -8133,7 +8137,6 @@ public class WindowManagerService extends IWindowManager.Stub
AppWindowToken topOpeningApp = null; AppWindowToken topOpeningApp = null;
int topOpeningLayer = 0; int topOpeningLayer = 0;
// TODO(cmautner): Move to animation side.
NN = mOpeningApps.size(); NN = mOpeningApps.size();
for (i=0; i<NN; i++) { for (i=0; i<NN; i++) {
AppWindowToken wtoken = mOpeningApps.get(i); AppWindowToken wtoken = mOpeningApps.get(i);