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

Merge "Improve debug output." into jb-mr1-dev

Browse Source
This commit is contained in:
Craig Mautner
2012-09-13 16:35:56 -07:00
committed by Android (Google) Code Review
parent cdfc56a387 dc5a6384e7
commit 4796dfd92c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3442,25 +3442,27 @@ public class WindowManagerService extends IWindowManager.Stub
if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,
"applyAnimation: atoken=" + atoken "applyAnimation: atoken=" + atoken
+ " anim=" + a + " nextAppTransition=ANIM_CUSTOM" + " anim=" + a + " nextAppTransition=ANIM_CUSTOM"
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " isEntrance=" + enter
+ " 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_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG, if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG,
"applyAnimation: atoken=" + atoken "applyAnimation: atoken=" + atoken
+ " anim=" + a + " nextAppTransition=ANIM_SCALE_UP" + " anim=" + a + " nextAppTransition=ANIM_SCALE_UP"
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " isEntrance=" + enter
+ " Callers " + Debug.getCallers(3));
} else if (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_UP || } else if (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_UP ||
mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN) { mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN) {
boolean scaleUp = (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_UP); boolean scaleUp = (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_UP);
a = createThumbnailAnimationLocked(transit, enter, false, scaleUp); a = createThumbnailAnimationLocked(transit, enter, false, scaleUp);
initialized = true; initialized = true;
if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) { if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) {
String animName = scaleUp ? "ANIM_THUMBNAIL_SCALE_UP" : "ANIM_THUMBNAIL_SCALE_DOWN"; String animName = scaleUp ? "ANIM_THUMBNAIL_SCALE_UP" : "ANIM_THUMBNAIL_SCALE_DOWN";
Slog.v(TAG, "applyAnimation: atoken=" + atoken Slog.v(TAG, "applyAnimation: atoken=" + atoken
+ " anim=" + a + " nextAppTransition=" + animName + " anim=" + a + " nextAppTransition=" + animName
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " isEntrance=" + enter
+ " Callers " + Debug.getCallers(3));
} }
} else { } else {
int animAttr = 0; int animAttr = 0;
@@ -3521,7 +3523,8 @@ public class WindowManagerService extends IWindowManager.Stub
"applyAnimation: atoken=" + atoken "applyAnimation: atoken=" + atoken
+ " anim=" + a + " anim=" + a
+ " animAttr=0x" + Integer.toHexString(animAttr) + " animAttr=0x" + Integer.toHexString(animAttr)
+ " transit=" + transit + " Callers " + Debug.getCallers(3)); + " transit=" + transit + " isEntrance=" + enter
+ " Callers " + Debug.getCallers(3));
} }
if (a != null) { if (a != null) {
if (DEBUG_ANIM) { if (DEBUG_ANIM) {