From f574bd55353086c91553f3a071753afa0af06482 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 9 May 2019 17:47:37 -0700 Subject: [PATCH] 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 --- .../src/com/android/quickstep/ContentFillItemAnimator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java index 6a571ef389..68cbd7a3ad 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: