summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-25 00:12:07 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-25 00:12:13 +0000
commit9063bfaad00de340bc614e677c1a3eeaadc7e433 (patch)
tree92cd939432e063bbb861b323a1fff8f51e6f88b9 /src
parentb713ad4adb7d7dbc926ee2ab793ee6ef38cd2520 (diff)
parent4c7fc62ae2f8c7bee397815deaa488c3cb6a2f76 (diff)
downloadandroid_packages_apps_Trebuchet-9063bfaad00de340bc614e677c1a3eeaadc7e433.tar.gz
android_packages_apps_Trebuchet-9063bfaad00de340bc614e677c1a3eeaadc7e433.tar.bz2
android_packages_apps_Trebuchet-9063bfaad00de340bc614e677c1a3eeaadc7e433.zip
Merge "Prevent extra animation when scrolling the recycler view." into ub-launcher3-burnaby
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
index 0177fd49e..2c4184dc4 100644
--- a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
+++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
@@ -170,10 +170,12 @@ public class BaseRecyclerViewFastScrollBar {
break;
case MotionEvent.ACTION_UP:
case MotionEvent.ACTION_CANCEL:
- mIsDragging = false;
mTouchOffset = 0;
- mPopup.animateVisibility(false);
- animateScrollbar(false);
+ if (mIsDragging) {
+ mIsDragging = false;
+ mPopup.animateVisibility(false);
+ animateScrollbar(false);
+ }
break;
}
}