commit db4e713c1865e94f010f6e91c2bb0e7242e86a41
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 25 20:22:08 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 20:22:08 2019 +0000
tree d0b476ea3a7731fb3e7f69d8d418705b6266af4b
parent a5ed906db8fdc2cdd0af6b3f8ff1f80c5bc2cfe8
parent 1335c36c15bbd92ee43b0f4a228b604422711b05

Merge "Don't layout empty tasks in layout anim if we have the actual content." into ub-launcher3-qt-dev

go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java

diff --git a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
index 1b6f2e3..9282345 100644
--- a/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
+++ b/go/quickstep/src/com/android/quickstep/ContentFillItemAnimator.java
@@ -161,6 +161,13 @@
 
     private void animateChangeImpl(ViewHolder viewHolder, long startDelay) {
         TaskItemView itemView = (TaskItemView) viewHolder.itemView;
+        if (itemView.getAlpha() == 0) {
+            // View is still not visible, so we can finish the change immediately.
+            CONTENT_TRANSITION_PROGRESS.set(itemView, 1.0f);
+            dispatchChangeFinished(viewHolder, true /* oldItem */);
+            dispatchFinishedWhenDone();
+            return;
+        }
         final ObjectAnimator anim =
                 ObjectAnimator.ofFloat(itemView, CONTENT_TRANSITION_PROGRESS, 0.0f, 1.0f);
         anim.setDuration(ITEM_CHANGE_DURATION).setStartDelay(startDelay);