Refactor fastscroll to disable zoom cleanly

Change-Id: I3912986aae78bd5a3244410e4486a52a50834867
issue-id: OPO-424

diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
index b97966f..006cfcc 100644 (file)
--- a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
+++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
@@ -54,7 +54,7 @@ public class BaseRecyclerViewFastScrollBar {
     public static class FastScrollFocusApplicator implements FastScrollFocusable {
         private static final int FAST_SCROLL_FOCUS_FADE_IN_DURATION = 175;
         private static final int FAST_SCROLL_FOCUS_FADE_OUT_DURATION = 125;
-        private static final float FAST_SCROLL_FOCUS_MAX_SCALE = 1f;
+        private static final float FAST_SCROLL_FOCUS_MAX_SCALE = 1.15f;
 
         private final View mView;
         private final int mFastScrollMode;
@@ -93,7 +93,7 @@ public class BaseRecyclerViewFastScrollBar {
 
         private FastScrollFocusApplicator(final View v, final int mode) {
             mView = v;
-            mFastScrollMode = mode;
+            mFastScrollMode = mode & ~FAST_SCROLL_FOCUS_SCALABLE; // Globally disable scaling.
         }
 
         public void setFastScrollFocused(boolean focused, boolean animated) {