diff options
author | Winson Chung <winsonc@google.com> | 2014-09-05 13:17:22 +0200 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2014-09-07 20:08:40 +0000 |
commit | 2e7f3bdcc9ec0b3e95b565b943ecee2210f4b937 (patch) | |
tree | 26dd0d99d4bd6f4e8ce8b0b718c14646ff3c604f /services/core/java/com/android/server/wm/AppTransition.java | |
parent | d78d4f3acd83d111a0d64d400694ed51a67f488e (diff) | |
download | frameworks_base-2e7f3bdcc9ec0b3e95b565b943ecee2210f4b937.zip frameworks_base-2e7f3bdcc9ec0b3e95b565b943ecee2210f4b937.tar.gz frameworks_base-2e7f3bdcc9ec0b3e95b565b943ecee2210f4b937.tar.bz2 |
Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)
Change-Id: Ic104876c5fe16997eca00e0a2b3d8644c927120c
Diffstat (limited to 'services/core/java/com/android/server/wm/AppTransition.java')
-rw-r--r-- | services/core/java/com/android/server/wm/AppTransition.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index aabb8f7..bfc7659 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -569,9 +569,9 @@ public class AppTransition implements Dump { int appWidth, int appHeight, int orientation, int transit, Rect containingFrame, Rect contentInsets, boolean isFullScreen) { Animation a; - final int thumbWidthI = mNextAppTransitionThumbnail.getWidth(); + final int thumbWidthI = mNextAppTransitionStartWidth; final float thumbWidth = thumbWidthI > 0 ? thumbWidthI : 1; - final int thumbHeightI = mNextAppTransitionThumbnail.getHeight(); + final int thumbHeightI = mNextAppTransitionStartHeight; final float thumbHeight = thumbHeightI > 0 ? thumbHeightI : 1; // Used for the ENTER_SCALE_UP and EXIT_SCALE_DOWN transitions @@ -993,7 +993,7 @@ public class AppTransition implements Dump { } void overridePendingAppTransitionAspectScaledThumb(Bitmap srcThumb, int startX, int startY, - IRemoteCallback startedCallback, boolean scaleUp) { + int targetWidth, int targetHeight, IRemoteCallback startedCallback, boolean scaleUp) { if (isTransitionSet()) { mNextAppTransitionType = scaleUp ? NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_UP : NEXT_TRANSIT_TYPE_THUMBNAIL_ASPECT_SCALE_DOWN; @@ -1002,6 +1002,8 @@ public class AppTransition implements Dump { mNextAppTransitionScaleUp = scaleUp; mNextAppTransitionStartX = startX; mNextAppTransitionStartY = startY; + mNextAppTransitionStartWidth = targetWidth; + mNextAppTransitionStartHeight = targetHeight; postAnimationCallback(); mNextAppTransitionCallback = startedCallback; } else { @@ -1138,6 +1140,10 @@ public class AppTransition implements Dump { pw.print(mNextAppTransitionStartX); pw.print(" mNextAppTransitionStartY="); pw.println(mNextAppTransitionStartY); + pw.print(" mNextAppTransitionStartWidth="); + pw.print(mNextAppTransitionStartWidth); + pw.print(" mNextAppTransitionStartHeight="); + pw.println(mNextAppTransitionStartHeight); pw.print(" mNextAppTransitionScaleUp="); pw.println(mNextAppTransitionScaleUp); break; } |