Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev am: 0964a2d9fc

am: 2679fe4e95

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
This commit is contained in:
Vladislav Kaznacheev
2017-04-13 03:57:09 +00:00
committed by android-build-merger
5 changed files with 7 additions and 10 deletions

View File

@@ -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);