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

Commit a77d4bdc authored by Ben Lin's avatar Ben Lin Committed by android-build-merger
Browse files

Merge "Add Fast Scroller to Files app." into arc-apps 

am: a7a4ad16

Change-Id: I839a9d3c48351a9c15c4533920b8bd81e374509d
parents ab184029 a7a4ad16

res/drawable/fast_scroll_thumb_drawable.xml

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

<!--

  ~ Copyright (C) 2017 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.

  -->

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

    <item android:state_pressed="true">

        <shape  android:shape="rectangle">

            <solid android:color="@color/scroll_thumb_pressed" />

            <size android:width="8dp" android:height="48dp" />

        </shape>

    </item>

    <item>

        <shape android:shape="rectangle">

            <solid android:color="@color/scroll_thumb" />

            <size android:width="8dp" android:height="48dp" />

        </shape>

    </item>

</selector>

res/drawable/fast_scroll_track_drawable.xml

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

<!--

  ~ Copyright (C) 2017 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:shape="rectangle">

    <solid android:color="@color/scroll_track" />

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

</shape>

res/layout/fragment_directory.xml

+1 −2
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ 


                <android.support.v7.widget.RecyclerView

                    android:id="@+id/dir_list"

                    android:scrollbars="vertical"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent"

                    android:paddingStart="0dp"
@@ -98,7 +97,7 @@ 
                    android:paddingTop="0dp"

                    android:paddingBottom="0dp"

                    android:clipToPadding="false"

                    android:scrollbarStyle="outsideOverlay"

                    android:scrollbars="none"

                    android:drawSelectorOnTop="true"/>

            </LinearLayout>

        </FrameLayout>

res/values/colors.xml

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


    <color name="dialog_title">@*android:color/primary_text_default_material_light</color>



    <color name="scroll_thumb_pressed">#ff8c8c8c</color>

    <color name="scroll_thumb">#ffbebebe</color>

    <color name="scroll_track">#fff0f0f0</color>



</resources>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -58,4 +58,8 @@ 
    <dimen name="drop_icon_width">14dp</dimen>



    <dimen name="header_message_horizontal_padding">8dp</dimen>



    <dimen name="fastscroll_default_thickness">8dp</dimen>

    <dimen name="fastscroll_minimum_range">50dp</dimen>

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

</resources>