diff options
| author | 2012-09-13 16:35:56 -0700 | |
|---|---|---|
| committer | 2012-09-13 16:35:56 -0700 | |
| commit | 4796dfd92cd8abc102be2b65b9991ae264eaf672 (patch) | |
| tree | 4c366854f51bbb0c485b8e77785db6c1d4b164a7 | |
| parent | cdfc56a3872f6bae7c43aedd5c718c5fa3fbdf9d (diff) | |
| parent | dc5a6384e7a82ac732c483e32b7acce6dfa443a8 (diff) | |
Merge "Improve debug output." into jb-mr1-dev
| -rwxr-xr-x | services/java/com/android/server/wm/WindowManagerService.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index dd980070dd0b..f239588a1722 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3442,25 +3442,27 @@ public class WindowManagerService extends IWindowManager.Stub if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG, "applyAnimation: atoken=" + atoken + " 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) { a = createScaleUpAnimationLocked(transit, enter); initialized = true; if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) Slog.v(TAG, "applyAnimation: atoken=" + atoken + " 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 || mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_DOWN) { boolean scaleUp = (mNextAppTransitionType == ActivityOptions.ANIM_THUMBNAIL_SCALE_UP); a = createThumbnailAnimationLocked(transit, enter, false, scaleUp); initialized = true; - if (DEBUG_APP_TRANSITIONS || DEBUG_ANIM) { String animName = scaleUp ? "ANIM_THUMBNAIL_SCALE_UP" : "ANIM_THUMBNAIL_SCALE_DOWN"; Slog.v(TAG, "applyAnimation: atoken=" + atoken + " anim=" + a + " nextAppTransition=" + animName - + " transit=" + transit + " Callers " + Debug.getCallers(3)); + + " transit=" + transit + " isEntrance=" + enter + + " Callers " + Debug.getCallers(3)); } } else { int animAttr = 0; @@ -3521,7 +3523,8 @@ public class WindowManagerService extends IWindowManager.Stub "applyAnimation: atoken=" + atoken + " anim=" + a + " animAttr=0x" + Integer.toHexString(animAttr) - + " transit=" + transit + " Callers " + Debug.getCallers(3)); + + " transit=" + transit + " isEntrance=" + enter + + " Callers " + Debug.getCallers(3)); } if (a != null) { if (DEBUG_ANIM) { |