summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Shvadskiy <ashvadskiy@cyngn.com>2016-02-04 11:14:10 -0800
committerTom Powell <zifnab@zifnab06.net>2017-03-26 16:15:30 -0700
commit4a52804aba96c5fe118902c3c84fd0f9f8f9608b (patch)
treee516dec47d942b96b8be7bad1fe6b74a54e448fd
parent1a521271a30660a3c1003a012b2f8e6ae6681038 (diff)
downloadandroid_packages_apps_Trebuchet-4a52804aba96c5fe118902c3c84fd0f9f8f9608b.zip
android_packages_apps_Trebuchet-4a52804aba96c5fe118902c3c84fd0f9f8f9608b.tar.gz
android_packages_apps_Trebuchet-4a52804aba96c5fe118902c3c84fd0f9f8f9608b.tar.bz2
Refactor fastscroll to disable zoom cleanly
Change-Id: I3912986aae78bd5a3244410e4486a52a50834867 issue-id: OPO-424
-rw-r--r--src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
index 2b3217c..44790c4 100644
--- a/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
+++ b/src/com/android/launcher3/BaseRecyclerViewFastScrollBar.java
@@ -47,7 +47,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;
@@ -86,7 +86,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) {