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

Commit ee10f27c authored by Vladislav Kaznacheev's avatar Vladislav Kaznacheev Committed by android-build-merger
Browse files

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

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

Change-Id: Ia664d87748f1febf544a5def60802456951dc23e
parents 6306035a 2679fe4e

core/java/android/view/ViewConfiguration.java

+2 −3
Original line number Original line 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

     * Defines the width of the horizontal scrollbar and the height of the vertical scrollbar in

     * dips

     * 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

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




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

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

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

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

        mScrollbarSize = res.getDimensionPixelSize(

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

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

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

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

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

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

core/res/res/drawable/scrollbar_handle_material.xml

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

       android:shape="rectangle">

    <solid

    <solid

        android:color="#84ffffff" />

        android:color="#84ffffff" />

    <size

        android:width="4dp"

        android:height="4dp" />

</shape>
 
</shape>

core/res/res/values/config.xml

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

    <!-- 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>

    <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

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

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

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

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

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

core/res/res/values/symbols.xml

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

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

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

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

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

  <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_horizontalScrollFactor" />

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

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

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

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

core/res/res/values/themes_material.xml

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

        <!-- Scrollbar attributes -->

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

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

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

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

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

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

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

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

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

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

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

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

        <!-- Scrollbar attributes -->

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

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

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

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

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

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

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

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

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

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

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

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