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

Commit b61894e8 authored by Annie Chin's avatar Annie Chin
Browse files

Update fastscroll on pre-L to use pink/white color scheme. 

Change fastscroll headers in JB and KK to accommodate smaller preview
(Ex. "+3" instead of "GMT +3:30"

Bug: 19504103
Change-Id: Icc45992a4efa54e41c43bd16bca9f4449a835dc3
parents 39fa328e 955d95ca

res/drawable/fastscroll_preview.xml

0 → 100644
+22 −0
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.

  -->



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

    android:shape="rectangle">

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

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

</shape>

res/layout/cities_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
<ListView

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

    android:id="@+id/cities_list"

    android:theme="@style/CitiesListViewTheme"

    android:theme="@style/CitiesListViewThemeOverlay"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:divider="@null"

res/values-v21/styles.xml

+19 −0
Original line number Diff line number Diff line
@@ -54,4 +54,23 @@ 
        <item name="android:fontFamily">sans-serif-medium</item>

    </style>



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

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

        <item name="android:fastScrollStyle">@style/FastScrollStyle</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>



    <!-- This is to control the FastScroll background color -->

    <style name="CitiesListViewThemeOverlay">

        <item name="android:colorControlActivated">@color/hot_pink</item>

    </style>



</resources>
 
 No newline at end of file

res/values/strings.xml

+17 −0
Original line number Diff line number Diff line
@@ -268,6 +268,23 @@ 
      <item>-1</item> <!-- Off -->

      </string-array>



    <!-- Week start day preference title. -->

    <string name="week_start_title">Start week on</string>



    <!-- Entries listed in ListPreference for start day. -->

    <string-array name="week_start_entries">

        <item>Saturday</item>

        <item>Sunday</item>

        <item>Monday</item>

    </string-array>



    <!-- Values for ListPreference for start day of week. -->

    <string-array name="week_start_values" translatable="false">

        <item>7</item> <!-- Calendar.SATURDAY -->

        <item>1</item> <!-- Calendar.SUNDAY -->

        <item>2</item> <!-- Calendar.MONDAY -->

    </string-array>



    <!-- Done button when editing an alarm. -->

    <string name="done">Done</string>

res/values/styles.xml

+3 −14
Original line number Diff line number Diff line
@@ -100,8 +100,10 @@ 
    </style>



    <style name="CitiesTheme" parent="@style/DeskClockParentTheme">

        <item name="android:fastScrollPreviewBackgroundLeft">@drawable/fastscroll_preview</item>

        <item name="android:fastScrollPreviewBackgroundRight">@drawable/fastscroll_preview</item>

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

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

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

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

    </style>
@@ -111,22 +113,9 @@ 
        <item name="displayOptions">homeAsUp</item>

    </style>



    <!-- This is to control the FastScroll background color -->

    <style name="CitiesListViewTheme" parent="@style/CitiesTheme">

        <item name="android:colorControlActivated">@color/hot_pink</item>

    </style>



    <!-- variants: v21 -->

    <style name="FabStyle" />



    <style name="FastScrollStyle" parent="@android:style/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>



    <style name="AlarmAlertFullScreenTheme" parent="AppCompatTranslucentDecorTheme" />



    <style name="TimerAlertFullScreenTheme" parent="AppCompatTranslucentDecorTheme">