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

Commit 8ed08863 authored by James Kung's avatar James Kung Committed by Android (Google) Code Review
Browse files

Merge "Red fast scroll thumb drawable" into ics-ub-clock-amazon

parents 173a5923 c3e13b78

AndroidManifest.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ 




        <activity android:name=".worldclock.CitiesActivity"

        <activity android:name=".worldclock.CitiesActivity"

                android:label="@string/cities_activity_title"

                android:label="@string/cities_activity_title"

                android:theme="@style/SettingsTheme"

                android:theme="@style/CitiesTheme"

                android:taskAffinity=""

                android:taskAffinity=""

                android:excludeFromRecents="true"

                android:excludeFromRecents="true"

                >

                >

res/drawable-xxhdpi/fastscroll_thumb_default_holo.png

0 → 100644
+1.33 KiB
Loading image diff...

res/drawable-xxhdpi/fastscroll_thumb_pressed_holo.png

0 → 100644
+1.63 KiB
Loading image diff...

res/drawable/red_fastscroll_thumb.xml

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

<!-- Copyright (C) 2013 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"

        android:drawable="@drawable/fastscroll_thumb_pressed_holo" />



    <item android:state_pressed="false"

        android:drawable="@drawable/fastscroll_thumb_default_holo" />

</selector>
 
 No newline at end of file

res/values/styles.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,10 @@ 
        <item name="android:selectableItemBackground">@drawable/item_background</item>

        <item name="android:selectableItemBackground">@drawable/item_background</item>

    </style>

    </style>





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

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

    </style>



    <style name="SettingsTheme.ActionBar" parent="@android:style/Widget.Holo.ActionBar">

    <style name="SettingsTheme.ActionBar" parent="@android:style/Widget.Holo.ActionBar">

        <item name="android:titleTextStyle">@style/SettingsTheme.TextAppearance.ActionBar.Title</item>

        <item name="android:titleTextStyle">@style/SettingsTheme.TextAppearance.ActionBar.Title</item>

        <item name="android:displayOptions">useLogo|showTitle</item>

        <item name="android:displayOptions">useLogo|showTitle</item>