commit 9063bfaad00de340bc614e677c1a3eeaadc7e433
author Winson Chung <winsonc@google.com> Thu Jun 25 00:12:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 25 00:12:13 2015 +0000
tree 92cd939432e063bbb861b323a1fff8f51e6f88b9
parent b713ad4adb7d7dbc926ee2ab793ee6ef38cd2520
parent 4c7fc62ae2f8c7bee397815deaa488c3cb6a2f76

Merge "Prevent extra animation when scrolling the recycler view." into ub-launcher3-burnaby

src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java

diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
index 0177fd4..2c4184d 100644
--- a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
+++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
@@ -170,10 +170,12 @@
                 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;
         }
     }