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

Commit faf09eaa authored by Agnieszka Madurska's avatar Agnieszka Madurska Committed by Android (Google) Code Review
Browse files

Merge "Add custom scrollbars to the default device theme" into cw-f-dev

parents 46af871c 78a340f2

core/res/res/drawable-watch/scrollbar_vertical_thumb.xml

0 → 100644
+23 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="?attr/colorControlNormal"

    android:shape="rectangle">

    <solid android:color="#39757575" />

    <size android:height="10dp" />

    <corners android:radius="2dp" />

</shape>

core/res/res/drawable-watch/scrollbar_vertical_track.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android"

    android:tint="?attr/colorControlNormal"

    android:shape="rectangle">

    <solid android:color="#39ffffff" />

    <size android:width="4dp" />

</shape>

core/res/res/values-watch/config_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -29,4 +29,8 @@ 


    <!-- Always overscan by default to ensure onApplyWindowInsets will always be called. -->

    <bool name="config_windowOverscanByDefault">true</bool>



    <!-- Style the scrollbars accoridngly. -->

    <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_vertical_thumb</drawable>

    <drawable name="config_scrollbarTrackVertical">@drawable/scrollbar_vertical_track</drawable>

</resources>

core/res/res/values/config_material.xml

+4 −0
Original line number Diff line number Diff line
@@ -37,4 +37,8 @@ 


    <!-- The amount to offset when scrolling to a selection in an AlertDialog -->

    <dimen name="config_alertDialogSelectionScrollOffset">0dp</dimen>



    <!-- Style the scrollbars accoridngly. -->

    <drawable name="config_scrollbarThumbVertical">@drawable/scrollbar_handle_material</drawable>

    <drawable name="config_scrollbarTrackVertical">@null</drawable>

</resources>

core/res/res/values/themes_material.xml

+4 −4
Original line number Diff line number Diff line
@@ -212,9 +212,9 @@ please see themes_device_defaults.xml. 
        <item name="scrollbarDefaultDelayBeforeFade">400</item>

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

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

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

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

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

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

        <item name="scrollbarTrackVertical">@drawable/config_scrollbarTrackVertical</item>



        <!-- Text selection handle attributes -->

        <item name="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>
@@ -573,9 +573,9 @@ please see themes_device_defaults.xml. 
        <item name="scrollbarDefaultDelayBeforeFade">400</item>

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

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

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

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

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

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

        <item name="scrollbarTrackVertical">@drawable/config_scrollbarTrackVertical</item>



        <!-- Text selection handle attributes -->

        <item name="textSelectHandleLeft">@drawable/text_select_handle_left_material</item>