commit 76c59da5c02ed522837352f45f5db2287a849d60
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:42:53 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:42:53 2018 +0000
tree 4f267f3d23f51f524aee23172c185f13772ff83e
parent 8007be1f1ed8820434d7dda700e0ec6a96529b48
parent cd1727c069deba9f81e772fd071bf7a808e1e978

[automerger] Fix crash caused by removing update listener in update listener. am: 012d39a0e9 am: cd1727c069

Change-Id: Icd7aab53e7bd7cb65132f10ff752165ff57e2b46

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 68ad6e3..72ba418 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -466,9 +466,12 @@
      */
     public void addSpringFromFlingUpdateListener(ValueAnimator animator, float velocity) {
         animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
+            boolean shouldSpring = true;
+
             @Override
             public void onAnimationUpdate(ValueAnimator valueAnimator) {
-                if (valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
+                if (shouldSpring
+                        && valueAnimator.getAnimatedFraction() >= FLING_ANIMATION_THRESHOLD) {
                     int searchViewId = getSearchView().getId();
                     addSpringView(searchViewId);
 
@@ -481,7 +484,7 @@
                                 }
                             });
 
-                    animator.removeUpdateListener(this);
+                    shouldSpring = false;
                 }
             }
         });