diff options
author | Winson Chung <winsonc@google.com> | 2014-11-04 16:15:22 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2014-11-04 18:04:09 -0800 |
commit | ab79fce2e71b6816b2b88b826ca723b3591f1e26 (patch) | |
tree | af1d637fd59e0ce98f4619abe1d2ee9a188b0cc5 /services/core/java/com/android/server/wm/AppTransition.java | |
parent | 0841cf7f37d7b20a08fa894c366f32fde55ea7e9 (diff) | |
download | frameworks_base-ab79fce2e71b6816b2b88b826ca723b3591f1e26.zip frameworks_base-ab79fce2e71b6816b2b88b826ca723b3591f1e26.tar.gz frameworks_base-ab79fce2e71b6816b2b88b826ca723b3591f1e26.tar.bz2 |
Fixing crash in recents window transition. (Bug 18246975, 18159006)
The recents transition requires synchronizing the thumbnail header (the bar
that animates on top of the window that is being scaled/cropped) and the
application window. This change simplifies the code and removes the notion
of having another animator manage the same surface, and instead ensures that
the thumbnail animation has the same duration and that the thumbnail animation
is deferred and cleaned up one frame after the app transition is complete.
Change-Id: If8f348afccf59327187e8498eb451ba066600a41
Diffstat (limited to 'services/core/java/com/android/server/wm/AppTransition.java')
-rw-r--r-- | services/core/java/com/android/server/wm/AppTransition.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/AppTransition.java b/services/core/java/com/android/server/wm/AppTransition.java index bfc7659..eeb007c 100644 --- a/services/core/java/com/android/server/wm/AppTransition.java +++ b/services/core/java/com/android/server/wm/AppTransition.java @@ -691,8 +691,10 @@ public class AppTransition implements Dump { throw new RuntimeException("Invalid thumbnail transition state"); } - return prepareThumbnailAnimationWithDuration(a, appWidth, appHeight, - THUMBNAIL_APP_TRANSITION_DURATION, mThumbnailFastOutSlowInInterpolator); + int duration = Math.max(THUMBNAIL_APP_TRANSITION_ALPHA_DURATION, + THUMBNAIL_APP_TRANSITION_DURATION); + return prepareThumbnailAnimationWithDuration(a, appWidth, appHeight, duration, + mThumbnailFastOutSlowInInterpolator); } /** |