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

Commit 69ca5f1f authored by Justin Klaassen's avatar Justin Klaassen
Browse files

resolved conflicts for merge of 7b5c5b16 to ub-deskclock-business 

Change-Id: If512dbcca09bce146510d8a8e79c73a7e90e9fbd
parents 54983f1a 7b5c5b16

res/layout/alarm_time.xml

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


        <android.support.v7.widget.SwitchCompat

            android:id="@+id/onoff"

            android:theme="@style/AlarmSwitchTheme"

            android:theme="@style/ControlAccentThemeOverlay"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/touch_target_min_size"

            android:layout_gravity="center_vertical|end" />

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/CitiesListViewThemeOverlay"

    android:theme="@style/ControlAccentThemeOverlay"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:divider="@null"

res/values-v19/styles.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.

-->



<resources>



    <style name="AppCompatTranslucentDecorTheme" parent="Theme.AppCompat.NoActionBar">

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>



</resources>

res/values-v21/styles.xml

+12 −12
Original line number Diff line number Diff line
@@ -20,16 +20,21 @@ 
        <item name="android:elevation">8dip</item>

    </style>



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

        <item name="android:alertDialogTheme">@style/AlertDialogTheme</item>

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

        <item name="android:alertDialogTheme">@style/SettingsAlertDialogTheme</item>

        <item name="android:detailsElementBackground">@null</item>

        <item name="android:dialogTheme">@style/AlertDialogTheme</item>

        <item name="android:dropDownListViewStyle">@style/DeskClockDropDownListView</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>



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

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

    </style>



    <!-- Theme that will be used by PreferenceFragment (i.e. *not* AppCompat). -->

    <style name="SettingsAlertDialogTheme" parent="android:Theme.Material.Dialog.Alert">

        <item name="android:colorAccent">?attr/colorAccent</item>

    </style>



    <!-- Custom notification content styles -->

    <style name="TextAppearance.StatusBar.EventContent">

        <item name="android:textSize">@dimen/notification_text_size</item>
@@ -43,9 +48,9 @@ 
    <style name="TimePickerTheme" parent="Theme.AppCompat.Dialog">

        <item name="android:background">@color/time_picker_gray</item>

        <item name="android:timePickerStyle">@style/TimePickerStyle</item>

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

        <item name="android:textColorPrimaryInverse">?attr/colorAccent</item>



        <!-- Propagates to android:colorAccent via the appcompat theme. -->

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

        <item name="colorAccent">@color/hot_pink</item>

    </style>
@@ -66,7 +71,7 @@ 
        <item name="android:fontFamily">sans-serif-medium</item>

    </style>



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

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

        <item name="android:fastScrollPreviewBackgroundLeft">

            @drawable/fastscroll_preview_left

        </item>
@@ -87,9 +92,4 @@ 
        <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>

res/values/styles.xml

+43 −34
Original line number Diff line number Diff line
@@ -14,30 +14,44 @@ 
     limitations under the License.

-->



<resources>

<resources xmlns:tools="http://schemas.android.com/tools">



    <style name="clock">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">match_parent</item>

        <item name="android:layout_gravity">center_horizontal</item>

    </style>



    <!-- variants: v19 -->

    <style name="AppCompatTranslucentDecorTheme" parent="Theme.AppCompat.NoActionBar" />

    <style name="AppCompatTranslucentDecorTheme" parent="Theme.AppCompat.NoActionBar">

        <item name="android:windowContentOverlay">@null</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:windowTranslucentNavigation">true</item>

    </style>



    <style name="DeskClockParentTheme" parent="Theme.AppCompat">

        <item name="android:statusBarColor">@color/status_bar</item>

    <style name="BaseActivityTheme" parent="Theme.AppCompat">

        <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>



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

        <item name="alertDialogTheme">@style/AlertDialogTheme</item>

        <item name="colorAccent">@color/hot_pink</item>

        <item name="colorPrimaryDark">@color/status_bar</item>

        <item name="colorControlActivated">@color/white</item>

        <item name="colorControlNormal">@color/white</item>

    </style>



    <style name="AlarmSwitchTheme">

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

    <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">

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

        <item name="colorAccent">@color/hot_pink</item>

    </style>



    <style name="ControlAccentThemeOverlay">

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

        <item name="colorControlActivated">?attr/colorAccent</item>

    </style>



    <style name="TimeLabelTextAppearance" parent="TextAppearance.AppCompat">

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

        <item name="android:textSize">60dp</item>

        <item name="android:textSize" tools:ignore="SpUsage">60dp</item>

    </style>



    <style name="AmPmTextAppearance" parent="TextAppearance.AppCompat">
@@ -45,18 +59,11 @@ 
        <item name="android:textSize">16sp</item>

    </style>



    <style name="AlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">

        <item name="colorAccent">@color/hot_pink</item>

    </style>



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

    <style name="DeskClock" parent="@style/BaseActivityTheme">

        <item name="android:windowActionBarOverlay">true</item>

        <item name="android:windowBackground">@color/default_background</item>

        <item name="android:actionBarStyle">@style/DeskClockActionBarStyle</item>

        <item name="android:actionBarTabStyle">@style/DeskClockTabStyle</item>

        <item name="android:actionBarTabBarStyle">@style/DeskClockTabBarStyle</item>

        <item name="android:dropDownListViewStyle">@style/DeskClockDropDownListView</item>

        <!-- For support library -->



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

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

        <item name="actionBarTabStyle">@style/DeskClockTabStyle</item>

        <item name="actionBarTabBarStyle">@style/DeskClockTabBarStyle</item>
@@ -75,7 +82,7 @@ 
    <style name="DeskClockTabBarStyle" parent="Widget.AppCompat.ActionBar.TabBar">

        <item name="android:dividerPadding">12dp</item>

        <item name="android:gravity">center</item>

        <item name="android:showDividers">none</item>

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

        <item name="showDividers">none</item>

    </style>
@@ -83,38 +90,41 @@ 
        <item name="android:background">@null</item>

        <item name="android:backgroundStacked">@null</item>

        <item name="android:backgroundSplit">@null</item>

        <!-- Empty displayOptions is to hide App title at app launch -->

        <item name="android:displayOptions"></item>

        <!--suppress CheckTagEmptyBody Empty displayOptions to hide app title at launch. -->

        <item name="displayOptions"></item>

    </style>



    <style name="DeskClockDropDownListView" parent="Widget.AppCompat.ListView.DropDown" />



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

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

        <item name="android:detailsElementBackground">@null</item>

        <item name="android:dropDownListViewStyle">@style/DeskClockDropDownListView</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>



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

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

    </style>



    <style name="SettingsActionBarStyle" parent="@style/Widget.AppCompat.Toolbar">

        <item name="android:background">@null</item>

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



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

        <item name="displayOptions">showTitle|homeAsUp</item>

    </style>



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

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

        <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/fastscroll_thumb</item>

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



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

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

    </style>



    <style name="CitiesActionBarStyle" parent="Widget.AppCompat.ActionBar">

        <item name="android:background">@null</item>

        <item name="android:displayOptions">homeAsUp</item>



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

        <item name="displayOptions">homeAsUp</item>

    </style>
@@ -127,10 +137,7 @@ 
        <item name="android:imageButtonStyle">@style/ImageButtonStyle</item>

    </style>



    <style name="ScreensaverActivityTheme" parent="Theme.AppCompat.NoActionBar">

        <!-- Hide navigation bar when Dream is started from within the Clock app -->

        <item name="android:windowDrawsSystemBarBackgrounds">false</item>

    </style>

    <style name="ScreensaverActivityTheme" parent="Theme.AppCompat.NoActionBar" />



    <style name="ImageButtonStyle" parent="android:Widget.DeviceDefault.ImageButton">

        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
@@ -268,14 +275,14 @@ 
        <item name="android:textSize">@dimen/label_text_size</item>

    </style>



    <style name="PrimaryLabelTextAppearance" parent="@style/PrimaryLabelTextParentAppearance" />

    <style name="PrimaryLabelTextAppearance" parent="PrimaryLabelTextParentAppearance" />



    <style name="SecondaryLabelTextParentAppearance">

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

        <item name="android:textSize">@dimen/label_text_size</item>

    </style>



    <style name="SecondaryLabelTextAppearance" parent="@style/SecondaryLabelTextParentAppearance" />

    <style name="SecondaryLabelTextAppearance" parent="SecondaryLabelTextParentAppearance" />



    <style name="TextAppearance">

        <item name="android:textSize">16sp</item>
@@ -292,10 +299,12 @@ 
        <item name="android:textSize">@dimen/notification_text_size</item>

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

    </style>



    <style name="TextAppearance.StatusBar.EventContent.Title">

        <item name="android:textSize">@dimen/notification_title_text_size</item>

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

    </style>



    <style name="ToastBarStyle">

        <item name="android:layout_width">match_parent</item>

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