summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorArtem Shvadskiy <ashvadskiy@cyngn.com>2016-02-04 11:14:10 -0800
committerArtem Shvadskiy <ashvadskiy@cyngn.com>2016-02-04 11:14:10 -0800
commitf4c5fae44d3e9dd118fcb80ef8dbc02bccf0c189 (patch)
tree40900160fa6c80a92a1998d7a13cb2336303d39a /src/com
parentaf31774e23578c40243c265a6ccc038297aef7f9 (diff)
downloadandroid_packages_apps_Trebuchet-f4c5fae44d3e9dd118fcb80ef8dbc02bccf0c189.zip
android_packages_apps_Trebuchet-f4c5fae44d3e9dd118fcb80ef8dbc02bccf0c189.tar.gz
android_packages_apps_Trebuchet-f4c5fae44d3e9dd118fcb80ef8dbc02bccf0c189.tar.bz2
Refactor fastscroll to disable zoom cleanly
Change-Id: I3912986aae78bd5a3244410e4486a52a50834867 issue-id: OPO-424
Diffstat (limited to 'src/com')
-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 b97966f..006cfcc 100644
--- 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) {