summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2018-05-25 10:37:53 -0700
committerJon Miranda <jonmiranda@google.com>2018-05-25 10:41:16 -0700
commit012d39a0e954614d41229e35af5152dbd3b27efb (patch)
tree49f0b32c9e6062fd68cad2fa6d8b14540903008b
parent5d6282fcf349e394e0301a1057cf9e61b5af9bf8 (diff)
downloadandroid_packages_apps_Trebuchet-012d39a0e954614d41229e35af5152dbd3b27efb.tar.gz
android_packages_apps_Trebuchet-012d39a0e954614d41229e35af5152dbd3b27efb.tar.bz2
android_packages_apps_Trebuchet-012d39a0e954614d41229e35af5152dbd3b27efb.zip
Fix crash caused by removing update listener in update listener.
Bug: 80236772 Test: Fling all apps open, and catch it before it reaches the top Change-Id: I082a26b97afb7dbc162758ff9654e4a3707f9d7e
-rw-r--r--src/com/android/launcher3/allapps/AllAppsContainerView.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 68ad6e346..72ba418b2 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -466,9 +466,12 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
*/
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 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo
}
});
- animator.removeUpdateListener(this);
+ shouldSpring = false;
}
}
});