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

Commit efa90a55 authored by Fan Zhang's avatar Fan Zhang
Browse files

Use appcompat's theme for city list fast scroll view. 

Bug: 23329239
Change-Id: Ibcbfaa9359110506324053bf4d9fe3826122562b
parent 1383573e

res/drawable-v19/fastscroll_preview.xml

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

<!-- Copyright (C) 2015 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.

-->



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

    android:insetRight="@dimen/fastscroll_preview_padding"

    android:insetLeft="@dimen/fastscroll_preview_padding">

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

        android:shape="rectangle">

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

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

    </shape>

</inset>

res/drawable/fastscroll_preview.xml

+19 −16
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 2015 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.
@@ -15,8 +14,12 @@ 
     limitations under the License.

-->



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

    android:insetRight="@dimen/fastscroll_preview_padding"

    android:insetLeft="@dimen/fastscroll_preview_padding">

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

        android:shape="rectangle">

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

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

    </shape>

</inset>

res/values-v21/styles.xml

+0 −15
Original line number Diff line number Diff line
@@ -68,24 +68,9 @@ 
    </style>



    <style name="CitiesTheme" parent="BaseActivityTheme">

        <item name="android:fastScrollPreviewBackgroundLeft">

            @drawable/fastscroll_preview_left

        </item>

        <item name="android:fastScrollPreviewBackgroundRight">

            @drawable/fastscroll_preview_right

        </item>

        <item name="android:fastScrollStyle">@style/FastScrollStyle</item>

        <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>

        <item name="android:fastScrollTrackDrawable">@drawable/fastscroll_track</item>

        <item name="actionBarStyle">@style/CitiesActionBarStyle</item>

    </style>



    <style name="FastScrollStyle" parent="android:Widget.Material.FastScroll">

        <item name="android:minWidth">48dip</item>

        <item name="android:minHeight">48dip</item>

        <item name="android:padding">16dip</item>

        <item name="android:textColor">@color/white</item>

        <item name="android:textSize">32sp</item>

    </style>



</resources>

res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ 
        <item name="android:fastScrollTextColor">@color/white</item>

        <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>

        <item name="android:fastScrollTrackDrawable">@drawable/fastscroll_track</item>



        <!-- Attributes from support.v7.appcompat -->

        <item name="actionBarStyle">@style/CitiesActionBarStyle</item>

    </style>