commit cd1727c069deba9f81e772fd071bf7a808e1e978
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:42:51 2018 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> Fri May 25 17:42:51 2018 +0000
tree 49f0b32c9e6062fd68cad2fa6d8b14540903008b
parent dc257e6e71c8619ac4c2cbfa79eb20241f3c67ca
parent 012d39a0e954614d41229e35af5152dbd3b27efb

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

Change-Id: I8f88ca66ee8d7ffed2de2864130331d5a0d9f6c8

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;
                 }
             }
         });