summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin <kevhan@google.com>2019-05-09 17:47:37 -0700
committerKevin <kevhan@google.com>2019-05-09 17:47:37 -0700
commitf574bd55353086c91553f3a071753afa0af06482 (patch)
tree7fce4a00e03122890d8a7fde3440326c631c02c9
parentb0fcded7aa9db78bba69d6476a478b7f35d840da (diff)
downloadandroid_packages_apps_Trebuchet-f574bd55353086c91553f3a071753afa0af06482.tar.gz
android_packages_apps_Trebuchet-f574bd55353086c91553f3a071753afa0af06482.tar.bz2
android_packages_apps_Trebuchet-f574bd55353086c91553f3a071753afa0af06482.zip
Ending pending anim should set to end values.
Pending animations have not started but when ending animations, we should ensure they are set to their end values based off the documentation for ItemAnimator's endAnimations and endAnimation. Bug: 132285006 Test: Build using endAnimations and manual test Change-Id: I3039a4f192d68a0ead700cd81675b3e7b4ef51f9
-rw-r--r--go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
index 6a571ef38..68cbd7a3a 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -240,9 +240,11 @@ public final class ContentFillItemAnimator extends SimpleItemAnimator {
ViewHolder item = pendAnim.viewHolder;
switch (pendAnim.animType) {
case ANIM_TYPE_REMOVE:
+ item.itemView.setAlpha(1.0f);
dispatchRemoveFinished(item);
break;
case ANIM_TYPE_CHANGE:
+ CONTENT_TRANSITION_PROGRESS.set(item.itemView, 1.0f);
dispatchChangeFinished(item, true /* oldItem */);
break;
default: