Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb5a5714 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Make scrollbarSize in Material Design theme configurable"""

parents 2639269a 8c89baaa

core/java/android/view/ViewConfiguration.java

+3 −2
Original line number Diff line number Diff line
@@ -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 = 10;

    private static final int SCROLL_BAR_SIZE = 4;



    /**

     * Duration of the fade when scrollbars fade away in milliseconds
@@ -354,7 +354,8 @@ public class ViewConfiguration { 


        mEdgeSlop = (int) (sizeAndDensity * EDGE_SLOP + 0.5f);

        mFadingEdgeLength = (int) (sizeAndDensity * FADING_EDGE_LENGTH + 0.5f);

        mScrollbarSize = (int) (density * SCROLL_BAR_SIZE + 0.5f);

        mScrollbarSize = res.getDimensionPixelSize(

                com.android.internal.R.dimen.config_scrollbarSize);

        mDoubleTapSlop = (int) (sizeAndDensity * DOUBLE_TAP_SLOP + 0.5f);

        mWindowTouchSlop = (int) (sizeAndDensity * WINDOW_TOUCH_SLOP + 0.5f);

core/res/res/drawable/scrollbar_handle_material.xml

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,4 @@ 
       android:shape="rectangle">

    <solid

        android:color="#84ffffff" />

    <size

        android:width="4dp"

        android:height="4dp" />

</shape>

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -1990,6 +1990,10 @@ 
    <!-- Amount of time in ms the user needs to press the relevant key to bring up the global actions dialog -->

    <integer name="config_globalActionsKeyTimeout">500</integer>



    <!-- Default width of a vertical scrollbar and height of a horizontal scrollbar.

         Takes effect only if the scrollbar drawables have no intrinsic size. -->

    <dimen name="config_scrollbarSize">4dp</dimen>



    <!-- Distance that should be scrolled, per axis value, in response to a horizontal

         {@link MotionEvent#ACTION_SCROLL} event. -->

    <dimen name="config_horizontalScrollFactor">64dp</dimen>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -451,6 +451,7 @@ 
  <java-symbol type="dimen" name="config_viewConfigurationTouchSlop" />

  <java-symbol type="dimen" name="config_viewMinFlingVelocity" />

  <java-symbol type="dimen" name="config_viewMaxFlingVelocity" />

  <java-symbol type="dimen" name="config_scrollbarSize" />

  <java-symbol type="dimen" name="config_horizontalScrollFactor" />

  <java-symbol type="dimen" name="config_verticalScrollFactor" />

  <java-symbol type="dimen" name="config_scrollFactor" />

core/res/res/values/themes_material.xml

+2 −2
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ please see themes_device_defaults.xml. 
        <!-- Scrollbar attributes -->

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarDefaultDelayBeforeFade">400</item>

        <item name="scrollbarSize">10dp</item>

        <item name="scrollbarSize">@dimen/config_scrollbarSize</item>

        <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_material</item>

        <item name="scrollbarThumbVertical">@drawable/config_scrollbarThumbVertical</item>

        <item name="scrollbarTrackHorizontal">@null</item>
@@ -582,7 +582,7 @@ please see themes_device_defaults.xml. 
        <!-- Scrollbar attributes -->

        <item name="scrollbarFadeDuration">250</item>

        <item name="scrollbarDefaultDelayBeforeFade">400</item>

        <item name="scrollbarSize">10dp</item>

        <item name="scrollbarSize">@dimen/config_scrollbarSize</item>

        <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_material</item>

        <item name="scrollbarThumbVertical">@drawable/config_scrollbarThumbVertical</item>

        <item name="scrollbarTrackHorizontal">@null</item>