diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-04-13 03:36:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-13 03:36:30 +0000 |
| commit | 0964a2d9fc45e3134b48f7ab59bac4e245d51ce5 (patch) | |
| tree | c188b23f4ab3f43002fc1709b58c1241dc429443 /core/java | |
| parent | 78b3b2308c6b7afcfce0ed25380443a96b3f3d43 (diff) | |
| parent | f619ead8d3cf479c965f10ad94960cacbcd7fc3d (diff) | |
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/view/ViewConfiguration.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java index 574137b30f1e..4def0d02c225 100644 --- a/core/java/android/view/ViewConfiguration.java +++ b/core/java/android/view/ViewConfiguration.java @@ -35,7 +35,7 @@ public class ViewConfiguration { * Defines the width of the horizontal scrollbar and the height of the vertical scrollbar in * dips */ - private static final int SCROLL_BAR_SIZE = 4; + private static final int SCROLL_BAR_SIZE = 10; /** * Duration of the fade when scrollbars fade away in milliseconds @@ -354,8 +354,7 @@ public class ViewConfiguration { mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f); mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f); - mScrollbarSize = res.getDimensionPixelSize( - com.android.internal.R.dimen.config_scrollbarSize); + mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f); mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f); mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f); |