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

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

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

parents 75d910b7 743fe59d
Loading
Loading
Loading
Loading
+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>
+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>
+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>
+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>
+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>
Loading