diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 27da155e7fa469cd1bd6e81a77211a213e46bf45..434efa430e9f34ceee5dbc8824a03e74a5c20a54 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -149,14 +149,14 @@
android:excludeFromRecents="true"
android:resizeableActivity="false"
android:showOnLockScreen="true"
- android:showWhenLocked="true"
+ android:showWhenLocked="true"
android:taskAffinity=""
android:windowSoftInputMode="stateAlwaysHidden" />
+ android:theme="@style/Theme.AlarmSelectionActivity" />
- -
-
+
@@ -12,7 +12,7 @@
-
-
+
diff --git a/res/layout-land/clock_fragment.xml b/res/layout-land/clock_fragment.xml
index a29a09da7a1f6f093898db0d6213b4d277050b77..3ec4260a93e4d3526ea25a0c83c451e69173a5b4 100644
--- a/res/layout-land/clock_fragment.xml
+++ b/res/layout-land/clock_fragment.xml
@@ -16,6 +16,7 @@
@@ -29,6 +30,7 @@
@@ -38,6 +40,7 @@
layout="@layout/main_clock_frame"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:background="@color/default_background"
android:layout_weight="29" />
@@ -54,6 +57,7 @@
android:id="@+id/cities"
android:layout_width="0dp"
android:layout_height="wrap_content"
+ android:background="@color/default_background"
android:layout_gravity="center"
android:layout_weight="33"
android:clickable="false"
diff --git a/res/layout-land/main_clock_frame.xml b/res/layout-land/main_clock_frame.xml
index b72f6233326b1e465c32c61cb5b583dd91ce2139..3b47836dc3c8046e915384d9145c31045c8f39f0 100644
--- a/res/layout-land/main_clock_frame.xml
+++ b/res/layout-land/main_clock_frame.xml
@@ -15,6 +15,7 @@
@@ -29,6 +31,7 @@
android:id="@+id/analog_clock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:background="@color/default_background"
android:layout_marginEnd="@dimen/analog_clock_margin"
android:layout_marginLeft="@dimen/analog_clock_margin"
android:layout_marginRight="@dimen/analog_clock_margin"
@@ -38,6 +41,7 @@
@@ -31,11 +32,13 @@
@@ -46,6 +49,7 @@
@@ -26,6 +27,7 @@
diff --git a/res/layout-land/world_clock_item.xml b/res/layout-land/world_clock_item.xml
index e5e9398eace7f54021e86c6ed35782e2f7e2770e..f2bdcf579c9d418a84da3291839107459ab371e5 100644
--- a/res/layout-land/world_clock_item.xml
+++ b/res/layout-land/world_clock_item.xml
@@ -16,12 +16,14 @@
@@ -31,6 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
+ android:background="@color/default_background"
android:ellipsize="end"
android:singleLine="true"
android:includeFontPadding="false" />
@@ -39,6 +42,7 @@
android:id="@+id/analog_clock"
android:layout_width="@dimen/world_clock_analog_size"
android:layout_height="@dimen/world_clock_analog_size"
+ android:background="@color/default_background"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/bottom_text_spacing_analog_small" />
diff --git a/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml b/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
index 869282426b3e44628d476793200aea98a35d8f28..1ca72180cf005ab9dfa615fa129f7f0b941400fa 100644
--- a/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
+++ b/res/layout-w320dp-h320dp-land/stopwatch_fragment.xml
@@ -18,6 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/default_background"
android:baselineAligned="false"
android:orientation="horizontal">
@@ -31,27 +32,31 @@
+ android:layout_weight="@integer/guttered_content_width_percent"
+ android:background="@color/default_background" >
-
-
+ android:layout_height="match_parent"
+ android:background="@color/default_background" />
+
+
@@ -50,6 +55,7 @@
android:layout_gravity="center"
android:gravity="center"
android:includeFontPadding="false"
+ android:background="@android:color/transparent"
android:paddingEnd="20dp"
android:paddingStart="20dp"
android:textSize="70sp" />
diff --git a/res/layout/alarm_activity.xml b/res/layout/alarm_activity.xml
index 61bff34555135f61bb0ddaa1e8322e7cee2f05d0..f4dbdb83ecc716f5dc84bd90077034a83176349c 100644
--- a/res/layout/alarm_activity.xml
+++ b/res/layout/alarm_activity.xml
@@ -18,6 +18,7 @@
+ android:background="@color/default_background"
+ android:textColor="@color/color_default_primary_text" />
diff --git a/res/layout/alarm_clock.xml b/res/layout/alarm_clock.xml
index eaf917805ab7f3049476eacc6ea3d8344c119afa..2d42899c6d23da93ee0ad4d5dc058edfa4924691 100644
--- a/res/layout/alarm_clock.xml
+++ b/res/layout/alarm_clock.xml
@@ -17,6 +17,7 @@
@@ -26,6 +27,7 @@
android:layout_height="match_parent"
android:clipToPadding="false"
android:descendantFocusability="beforeDescendants"
+ android:background="@color/default_background"
android:fadingEdgeLength="0dp"
android:paddingBottom="@dimen/fab_height"
android:scrollbarStyle="outsideOverlay"
@@ -43,6 +45,7 @@
android:paddingBottom="@dimen/fab_height"
android:text="@string/no_alarms"
android:textColor="@color/no_alarms"
+ android:background="@color/default_background"
android:visibility="gone" />
\ No newline at end of file
diff --git a/res/layout/alarm_row.xml b/res/layout/alarm_row.xml
index e6e6f7079595c367bda1a95c41791671220ecad4..e314d4aa85e99a8aca88a23f41f1431664f52c60 100644
--- a/res/layout/alarm_row.xml
+++ b/res/layout/alarm_row.xml
@@ -21,6 +21,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/alarm_label_padding"
android:gravity="top"
+ android:background="@color/default_background"
android:orientation="vertical">
@@ -45,7 +46,7 @@
android:ellipsize="end"
android:singleLine="true"
android:textSize="@dimen/label_font_size"
- android:textColor="@color/black"
+ android:textColor="@color/color_default_primary_text"
android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
android:layout_marginStart="@dimen/alarm_clock_vertical_margin" />
@@ -68,7 +69,7 @@
android:ellipsize="none"
android:singleLine="true"
android:textSize="@dimen/label_font_size"
- android:textColor="@color/black_54p" />
+ android:textColor="@color/color_default_primary_text" />
\ No newline at end of file
diff --git a/res/layout/alarm_time_collapsed.xml b/res/layout/alarm_time_collapsed.xml
index f806445582a33a4016ec967c73f4eaa41088e03e..5dde9826e3b7a20879a8df79f7c3708c11359d10 100644
--- a/res/layout/alarm_time_collapsed.xml
+++ b/res/layout/alarm_time_collapsed.xml
@@ -20,7 +20,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"
+ android:background="@color/default_background"
android:paddingEnd="16dp"
android:paddingStart="16dp"
app:columnCount="5"
@@ -44,6 +44,7 @@
android:layout_marginTop="@dimen/alarm_clock_vertical_margin"
android:minHeight="@dimen/touch_target_min_size"
android:minWidth="@dimen/touch_target_min_size"
+ android:background="@color/default_background"
app:layout_column="3"
app:layout_columnSpan="2"
app:layout_gravity="center_vertical"
@@ -52,6 +53,7 @@
+ android:textColor="@color/color_default_secondary_text" />
@@ -87,6 +91,7 @@
android:layout_height="wrap_content"
android:ellipsize="none"
android:focusable="true"
+ android:background="@color/default_background"
android:paddingEnd="@dimen/icon_margin"
android:paddingStart="@dimen/icon_margin"
android:singleLine="true" />
diff --git a/res/layout/alarm_time_summary.xml b/res/layout/alarm_time_summary.xml
index 25c76b3d757d94bb4f7c83d70a5eb8e79a2b36e4..e815e8cea1e6a4097b2b82a8fa9a90f9c17ea814 100644
--- a/res/layout/alarm_time_summary.xml
+++ b/res/layout/alarm_time_summary.xml
@@ -18,6 +18,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/digital_clock"
style="@style/display_time"
+ android:background="@android:color/transparent"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="?attr/selectableItemBackground"/>
+ android:layout_height="wrap_content"/>
diff --git a/res/layout/alarm_volume_preference.xml b/res/layout/alarm_volume_preference.xml
index e8e969f2017b90179a5b20586ba33656d9a790c5..10fb90ca803808b358f179fa9a07cf5cef9fbd9b 100644
--- a/res/layout/alarm_volume_preference.xml
+++ b/res/layout/alarm_volume_preference.xml
@@ -21,6 +21,7 @@
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:background="@color/default_background"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:clickable="false"
android:orientation="horizontal">
diff --git a/res/layout/cities_activity.xml b/res/layout/cities_activity.xml
index d80865d8305bf795eb1f7ec2d1dc8cb94cd4cef0..5c52bd888aece40edc25a44965acd52119ecd1da 100644
--- a/res/layout/cities_activity.xml
+++ b/res/layout/cities_activity.xml
@@ -19,6 +19,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/default_background"
android:fitsSystemWindows="true">
@@ -28,6 +29,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
+ android:background="@color/default_background"
android:divider="@null"
android:scrollbarStyle="insideInset"
android:theme="@style/ThemeOverlay.Control.Accent" />
diff --git a/res/layout/city_list_header.xml b/res/layout/city_list_header.xml
index 2db78efff6a54b1d48235177c7143345fbefbd3e..b2b9efa9c422a7d9dfe6cb16ff10389cf8bd91f8 100644
--- a/res/layout/city_list_header.xml
+++ b/res/layout/city_list_header.xml
@@ -25,5 +25,6 @@
android:paddingStart="20dp"
android:text="@string/selected_cities_label"
android:textAlignment="viewStart"
- android:textColor="@color/white"
+ android:textColor="@color/color_default_primary_text"
+ android:background="@color/default_background"
android:textSize="20sp" />
diff --git a/res/layout/city_list_item.xml b/res/layout/city_list_item.xml
index 520ab328d9ca18971db3eaa2bfbecfcdc245ad30..9fd7e1d5350f65d2edce2e2aee56d538c5b7a015 100644
--- a/res/layout/city_list_item.xml
+++ b/res/layout/city_list_item.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:background="?attr/selectableItemBackground"
+ android:background="@color/default_background"
android:minHeight="@dimen/cities_list_item_height"
android:orientation="horizontal">
+ android:textColor="@color/color_default_primary_text"
+ android:background="@color/default_background" />
diff --git a/res/layout/clock_fragment.xml b/res/layout/clock_fragment.xml
index d1b7619f269e0374045e4d6126f334ba521ee729..4a3a2c32fc8cdbd357d3f472b0e276c009dba368 100644
--- a/res/layout/clock_fragment.xml
+++ b/res/layout/clock_fragment.xml
@@ -18,6 +18,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/custom_pref_layout.xml b/res/layout/custom_pref_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..85c8467edee7fb4e78c4bbfd092e88488e562eae
--- /dev/null
+++ b/res/layout/custom_pref_layout.xml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/custom_pref_switch_layout.xml b/res/layout/custom_pref_switch_layout.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7dba76f896eb70c2dc8981f303ea1a74885db45f
--- /dev/null
+++ b/res/layout/custom_pref_switch_layout.xml
@@ -0,0 +1,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/custom_settings_toolbar.xml b/res/layout/custom_settings_toolbar.xml
new file mode 100644
index 0000000000000000000000000000000000000000..766760a7f31ea352d5f2f7a41bbb21dc95220873
--- /dev/null
+++ b/res/layout/custom_settings_toolbar.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/res/layout/date_and_next_alarm_time.xml b/res/layout/date_and_next_alarm_time.xml
index ad25502a8071fd0060a8d3cf7745193f22206453..a38660145bff10ab184849d60796dee1fe272364 100644
--- a/res/layout/date_and_next_alarm_time.xml
+++ b/res/layout/date_and_next_alarm_time.xml
@@ -19,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
+ android:background="@color/default_background"
android:gravity="center">
\ No newline at end of file
diff --git a/res/layout/day_button.xml b/res/layout/day_button.xml
index 9cebabfa598187b2cf0244cb44817ad8c894aa48..1eac9e12f4100ad85087b4aeef1323546684f6c0 100644
--- a/res/layout/day_button.xml
+++ b/res/layout/day_button.xml
@@ -26,5 +26,6 @@
android:background="@drawable/toggle_circle"
android:button="@null"
android:gravity="center"
+ android:textColor="@color/color_default_view_on_accent"
android:textSize="@dimen/day_button_font_size" />
\ No newline at end of file
diff --git a/res/layout/desk_clock.xml b/res/layout/desk_clock.xml
index bd898d034d88e472debf8083cc8289a1d3edc835..7988e67dd89f94f6899374193a9fbe4a3762e64e 100644
--- a/res/layout/desk_clock.xml
+++ b/res/layout/desk_clock.xml
@@ -1,5 +1,4 @@
-
-
-
+ app:statusBarBackground="@color/color_default_primary_dark">
+ tools:ignore="RtlSymmetry">
+ android:background="@color/color_default_primary_dark" />
@@ -53,17 +54,21 @@
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_weight="1">
+ android:layout_weight="1"
+ android:background="@color/default_background"
+ app:statusBarBackground="@color/default_background">
+ android:layout_height="match_parent"
+ android:background="@color/default_background" />
@@ -72,7 +77,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_gravity="start|center_vertical"
- android:layout_weight="1">
+ android:layout_weight="1"
+ android:background="@color/default_background">
diff --git a/res/layout/desk_clock_saver.xml b/res/layout/desk_clock_saver.xml
index dafabfddf8acf048671047ea321db2a5ccfbae47..3b90f8d2835a9a661ff2855dc01927eebab025c8 100644
--- a/res/layout/desk_clock_saver.xml
+++ b/res/layout/desk_clock_saver.xml
@@ -20,11 +20,12 @@
android:id="@+id/saver_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/black">
+ android:background="@color/default_background">
@@ -50,7 +52,8 @@
android:ellipsize="none"
android:gravity="center"
android:singleLine="true"
- android:textColor="@color/white"
+ android:background="@color/default_background"
+ android:textColor="@color/color_default_primary_text"
android:textSize="@dimen/main_clock_font_size" />
diff --git a/res/layout/digital_widget.xml b/res/layout/digital_widget.xml
index c5b4837a6f5ba03cd7fe6b6bd11bd20152039485..5290d8470e789f835907d2879dd1cdbcb2cb4076 100644
--- a/res/layout/digital_widget.xml
+++ b/res/layout/digital_widget.xml
@@ -33,7 +33,7 @@
android:format24Hour="@string/lock_screen_24_hour_format"
android:includeFontPadding="false"
android:singleLine="true"
- android:textColor="@color/white" />
+ android:textColor="@color/color_default_view_on_accent" />
+ android:textColor="@color/color_default_view_on_accent" />
+ android:textColor="@color/color_default_view_on_accent" />
diff --git a/res/layout/digital_widget_sizer.xml b/res/layout/digital_widget_sizer.xml
index f524cf536f6fb5de8198aa5b237fb10b2df279ab..976faa5a42a95ca5d3fc6e1958ac93b2d640add3 100644
--- a/res/layout/digital_widget_sizer.xml
+++ b/res/layout/digital_widget_sizer.xml
@@ -30,7 +30,7 @@
android:format12Hour="@string/lock_screen_12_hour_format"
android:format24Hour="@string/lock_screen_24_hour_format"
android:singleLine="true"
- android:textColor="@color/white" />
+ android:textColor="@color/color_default_primary_text" />
+ android:textColor="@color/color_default_primary_text" />
+ android:textColor="@color/accent_color" />
+ android:textColor="@color/color_default_primary_text" />
diff --git a/res/layout/lap_view.xml b/res/layout/lap_view.xml
index 4936977ed1b0e32b4deb97d66bdd88ac5416d41f..c8c4db7619b8f8545b21428dc3df9f8ce976426b 100644
--- a/res/layout/lap_view.xml
+++ b/res/layout/lap_view.xml
@@ -21,6 +21,7 @@
android:layoutDirection="ltr"
android:paddingTop="@dimen/body_font_padding"
android:paddingBottom="@dimen/body_font_padding"
+ android:background="@color/default_background"
android:gravity="center"
android:orientation="horizontal">
@@ -32,6 +33,7 @@
android:fontFeatureSettings="tnum"
android:gravity="start"
android:textAllCaps="false"
+ android:background="@color/default_background"
android:textAppearance="@style/SecondaryLabelTextAppearance" />
\ No newline at end of file
diff --git a/res/layout/loading_widget.xml b/res/layout/loading_widget.xml
index ff33db2a742845dd0fb65ca4959cb66ae949df3a..2151330a68ec71a53eabf2328e3042cc98e9fe6e 100644
--- a/res/layout/loading_widget.xml
+++ b/res/layout/loading_widget.xml
@@ -22,4 +22,4 @@
android:includeFontPadding="false"
android:singleLine="true"
android:text="@string/loading_widget"
- android:textColor="@color/white" />
\ No newline at end of file
+ android:textColor="@color/color_default_primary_text" />
\ No newline at end of file
diff --git a/res/layout/main_clock_frame.xml b/res/layout/main_clock_frame.xml
index ab960728fa5757f715e34f5cb82fe5a2a2e3f0ba..db5e36b1795360c4dce922d22788e2b4d70b0beb 100644
--- a/res/layout/main_clock_frame.xml
+++ b/res/layout/main_clock_frame.xml
@@ -16,6 +16,7 @@
@@ -30,16 +31,19 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="@integer/guttered_content_width_percent"
+ android:background="@color/default_background"
android:gravity="center_horizontal"
android:orientation="vertical">
diff --git a/res/layout/ringtone_item_header.xml b/res/layout/ringtone_item_header.xml
index 415e4defaf4e8b0f68c348dc795f66e6e2494eb0..8f6e212f2c6513efcddd1661312446ea9d0f661e 100644
--- a/res/layout/ringtone_item_header.xml
+++ b/res/layout/ringtone_item_header.xml
@@ -17,6 +17,7 @@
@@ -27,6 +28,7 @@
@@ -48,12 +51,14 @@
@@ -61,9 +66,10 @@
android:id="@+id/ringtone_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:background="@color/default_background"
android:paddingEnd="16dp"
android:paddingStart="16dp"
- android:textColor="@color/white"
+ android:textColor="@color/color_default_primary_text"
android:textSize="@dimen/alarm_text_font_size" />
@@ -76,6 +82,7 @@
android:layout_centerVertical="true"
android:importantForAccessibility="no"
android:scaleType="center"
+ android:background="@color/default_background"
android:tint="?attr/colorAccent"
android:visibility="gone"
app:srcCompat="@drawable/ic_checkmark" />
diff --git a/res/layout/ringtone_picker.xml b/res/layout/ringtone_picker.xml
index d2127fea97fd476aedc57c726adf3f2b8d20e43b..977f580c26583ab339350a77adeb5aa0c378240c 100644
--- a/res/layout/ringtone_picker.xml
+++ b/res/layout/ringtone_picker.xml
@@ -18,12 +18,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/default_background"
android:fitsSystemWindows="true">
diff --git a/res/layout/selection_layout.xml b/res/layout/selection_layout.xml
index 0bb11fb332fc16ec1dbbfbee176d1f91a5f254b4..f9be3192b917e58533d80812b217332c13acead0 100644
--- a/res/layout/selection_layout.xml
+++ b/res/layout/selection_layout.xml
@@ -13,7 +13,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/dismiss_alarm"
- android:textColor="@color/black"
+ android:textColor="@color/color_default_secondary_text"
android:textSize="@dimen/header_font_size"
android:layout_marginBottom="@dimen/alarm_picker_margin_bottom"/>
@@ -32,7 +32,7 @@
android:text="@android:string/cancel"
android:clickable="true"
android:gravity="end"
- android:background="@android:color/transparent"
- android:textColor="@android:color/holo_blue_light"/>
+ android:background="@color/transparent"
+ android:textColor="@color/color_default_secondary_text"/>
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index f1d87195293d295dbd33d49fc0268c4aba2fc542..274ce55663535d9a1d69ce4f29b9cbd384df9bbb 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -18,12 +18,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@color/default_background"
android:fitsSystemWindows="true">
diff --git a/res/layout/stopwatch_fragment.xml b/res/layout/stopwatch_fragment.xml
index 12a3903474b53957735545987f07b5c340d2c872..891caec8ad64fe40756f07678cc44d6d093e690c 100644
--- a/res/layout/stopwatch_fragment.xml
+++ b/res/layout/stopwatch_fragment.xml
@@ -17,6 +17,7 @@
-
-
+
+
@@ -34,6 +35,8 @@
android:includeFontPadding="false"
android:paddingEnd="3dp"
android:paddingStart="30dp"
+ android:textColor="@color/color_default_primary_text"
+ android:background="@android:color/transparent"
android:textSize="70sp" />
diff --git a/res/layout/timer_fragment.xml b/res/layout/timer_fragment.xml
index 6e9817bba0d6e906cc7aa209702a51dcb97b84c9..0a3a342c77e35b7ea7983503a0b5e5ca72cb0040 100644
--- a/res/layout/timer_fragment.xml
+++ b/res/layout/timer_fragment.xml
@@ -16,20 +16,24 @@
@@ -79,6 +84,7 @@
diff --git a/res/layout/timer_item.xml b/res/layout/timer_item.xml
index 607b78245be94b079d92e01bd274abc847b5a9aa..94716ef21de3b407b245dc610e97d1a0f8b11759 100644
--- a/res/layout/timer_item.xml
+++ b/res/layout/timer_item.xml
@@ -17,21 +17,25 @@
@@ -44,6 +48,7 @@
@@ -82,7 +82,7 @@
android:includeFontPadding="false"
android:singleLine="true"
android:textAllCaps="true"
- android:textColor="@color/white"
+ android:textColor="@color/color_default_view_on_accent"
android:textSize="@dimen/city_widget_name_font_size" />
@@ -104,7 +104,7 @@
android:layout_gravity="center"
android:baselineAligned="true"
android:gravity="center"
- android:textColor="@color/white" />
+ android:textColor="@color/color_default_view_on_accent" />
@@ -144,7 +144,7 @@
android:includeFontPadding="false"
android:singleLine="true"
android:textAllCaps="true"
- android:textColor="@color/white"
+ android:textColor="@color/color_default_view_on_accent"
android:textSize="@dimen/city_widget_name_font_size" />
diff --git a/res/values-night-v27/themes.xml b/res/values-night-v27/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..990401cb8ad1bdd2a8c2a66bbfdfdd917a13130d
--- /dev/null
+++ b/res/values-night-v27/themes.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
deleted file mode 100644
index be5642398c1ddbc504216e1655e01929a9411555..0000000000000000000000000000000000000000
--- a/res/values-night/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- #121212
- #FEF177
- #212121
-
diff --git a/res/values-sw360dp-v13/values-preference.xml b/res/values-sw360dp-v13/values-preference.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8ed48ca09616271b9502fe74dc3daf81aefc06c1
--- /dev/null
+++ b/res/values-sw360dp-v13/values-preference.xml
@@ -0,0 +1,6 @@
+
+
+
+ false
+ 0dp
+
\ No newline at end of file
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index f1dca16c017f171f0f5ee5a13ff7a7a76bf003e7..a89f1b113ef558f4f8ca46372115cf8fd3878b56 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -19,7 +19,7 @@
diff --git a/res/values-v27/themes.xml b/res/values-v27/themes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28ecf134b0824d5bff42f38f5db8ef8defbc956a
--- /dev/null
+++ b/res/values-v27/themes.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index c38a75471fc648acf129056731809370ded48148..cbf097ff431096d4d8bc8b7c4f8dc77855a1c63b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,35 +16,25 @@
-->
-
- #FF000000
- #DE000000
- #8A000000
-
- #FFFFFFFF
- #14FFFFFF
- #A0FFFFFF
- #80FFFFFF
- #4CFFFFFF
+ @color/gray1
#00000000
- #28FFFFFF
+ @color/color_default_divider
- #B3FFFFFF
-
- #1D1D1D
+ @lineageos.platform:color/color_default_background
- #000000
+ @color/color_default_secondary_text
- @lineageos.platform:color/color_default_blue1
- #2F378A
+ @lineageos.platform:color/color_default_primary
+ @lineageos.platform:color/color_default_primary_dark
+ @lineageos.platform:color/color_default_accent
@lineageos.platform:color/color_default_foreground
@lineageos.platform:color/color_default_primary_text
- @lineageos.platform:color/color_default_blue1
-
-
-
-
+ @lineageos.platform:color/color_default_secondary_text
+ @lineageos.platform:color/color_default_divider
+ @lineageos.platform:color/color_default_view_on_accent
+ @lineageos.platform:color/color_default_gray1
+ @lineageos.platform:color/color_default_gray2
diff --git a/res/values/styles.xml b/res/values/styles.xml
index fbe62ae3a4249a8228deb73695ad48760bc2860c..4bb82113fc67cdfb8db5d55a21c222a3fce9caae 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -19,7 +19,7 @@
@@ -102,24 +102,51 @@
- 12sp
-
-
+
+
@@ -129,9 +156,14 @@
+
+
diff --git a/res/values/themes.xml b/res/values/themes.xml
index c920c5b62613255a7da18711e9377a754ade7aad..b2c8f682a1abf643795fa35ab8e29217b6a508b0 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -17,49 +17,130 @@
-
+
+
+
+
+
+
-
+
+
+
+
-
-
+
+
+
+
+
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index 026b6e74c7885ba6af4a8f15cac27c05a51c23ff..e87aa211f780335e56ca62041edab0845fa22e9a 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -14,6 +14,7 @@
@@ -22,28 +23,38 @@
android:dialogTitle="@string/clock_style"
android:entries="@array/clock_style_entries"
android:entryValues="@array/clock_style_values"
+ android:layout="@layout/custom_pref_dropdown_layout"
android:key="clock_style"
+ app:iconSpaceReserved="false"
android:title="@string/clock_style" />
@@ -52,6 +63,8 @@
@@ -106,6 +129,8 @@
@@ -115,6 +140,8 @@
android:title="@string/timer_settings">
@@ -129,6 +158,8 @@
diff --git a/src/com/android/deskclock/BaseActivity.java b/src/com/android/deskclock/BaseActivity.java
index 143f2389f62c7c0a20f641c7d3aeb1813d30369d..d11e854cf3c73ca02ebcda71a71e29200b076e59 100644
--- a/src/com/android/deskclock/BaseActivity.java
+++ b/src/com/android/deskclock/BaseActivity.java
@@ -48,13 +48,13 @@ public abstract class BaseActivity extends AppCompatActivity {
super.onCreate(savedInstanceState);
// Allow the content to layout behind the status and navigation bars.
- getWindow().getDecorView().setSystemUiVisibility(
+ /*getWindow().getDecorView().setSystemUiVisibility(
View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
- | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
+ | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);*/
- final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
- adjustAppColor(color, false /* animate */);
+ //final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
+ //adjustAppColor(color, false /* animate */);
}
@Override
@@ -62,8 +62,8 @@ public abstract class BaseActivity extends AppCompatActivity {
super.onStart();
// Ensure the app window color is up-to-date.
- final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
- adjustAppColor(color, false /* animate */);
+ //final @ColorInt int color = ThemeUtils.resolveColor(this, android.R.attr.windowBackground);
+ //adjustAppColor(color, false /* animate */);
}
/**
diff --git a/src/com/android/deskclock/DeskClock.java b/src/com/android/deskclock/DeskClock.java
index c2026fef48e0217a57073ec23e6c25128f0dae97..cac91c777aa61b15db4d857e969a12f5841cc3f2 100644
--- a/src/com/android/deskclock/DeskClock.java
+++ b/src/com/android/deskclock/DeskClock.java
@@ -16,6 +16,8 @@
package com.android.deskclock;
+import androidx.core.content.ContextCompat;
+import android.graphics.drawable.ColorDrawable;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.AnimatorSet;
@@ -156,6 +158,7 @@ public class DeskClock extends BaseActivity
final ActionBar actionBar = getSupportActionBar();
if (actionBar != null) {
actionBar.setDisplayShowTitleEnabled(false);
+ actionBar.setBackgroundDrawable(new ColorDrawable(ContextCompat.getColor(this, R.color.color_default_primary_dark)));
}
// Configure the menu item controllers add behavior to the toolbar.
diff --git a/src/com/android/deskclock/DeskClockApplication.java b/src/com/android/deskclock/DeskClockApplication.java
index 395d385180ca50c0ba0e578dc5ab15d1d056316f..3f2afb32a29baff2e7529bc023b080f967393e51 100644
--- a/src/com/android/deskclock/DeskClockApplication.java
+++ b/src/com/android/deskclock/DeskClockApplication.java
@@ -28,12 +28,16 @@ import com.android.deskclock.data.DataModel;
import com.android.deskclock.events.LogEventTracker;
import com.android.deskclock.uidata.UiDataModel;
+import androidx.appcompat.app.AppCompatDelegate;
+
public class DeskClockApplication extends Application {
@Override
public void onCreate() {
super.onCreate();
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+
final Context applicationContext = getApplicationContext();
final SharedPreferences prefs = getDefaultSharedPreferences(applicationContext);
diff --git a/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java b/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
index 3777a477e378d13f91cfacc9eca8bcdb54151644..fd522bca6d2d3ef46e974267121597b3afe18ff4 100644
--- a/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
+++ b/src/com/android/deskclock/actionbarmenu/SearchMenuItemController.java
@@ -16,6 +16,10 @@
package com.android.deskclock.actionbarmenu;
+import androidx.core.content.ContextCompat;
+import android.content.res.ColorStateList;
+import androidx.core.widget.ImageViewCompat;
+import android.widget.ImageView;
import android.content.Context;
import android.os.Bundle;
import androidx.appcompat.widget.SearchView;
@@ -73,6 +77,11 @@ public final class SearchMenuItemController implements MenuItemController {
@Override
public void onCreateOptionsItem(Menu menu) {
final SearchView searchView = new SearchView(mContext);
+ ImageView searchClose = searchView.findViewById(R.id.search_close_btn);
+ searchClose.setImageResource(R.drawable.ic_close);
+ ImageView searchIcon = searchView.findViewById(R.id.search_button);
+ searchIcon.setImageResource(R.drawable.ic_magnifier);
+ ImageViewCompat.setImageTintList(searchIcon, ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.accent_color)));
searchView.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);
searchView.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
searchView.setQuery(mQuery, false);
diff --git a/src/com/android/deskclock/alarms/AlarmActivity.java b/src/com/android/deskclock/alarms/AlarmActivity.java
index 7b88e676652c5232b3f80eb267c1b325f248f2a6..20bc4e779af25990a7d6fbfb4cd2a084fe2d2444 100644
--- a/src/com/android/deskclock/alarms/AlarmActivity.java
+++ b/src/com/android/deskclock/alarms/AlarmActivity.java
@@ -15,6 +15,7 @@
*/
package com.android.deskclock.alarms;
+import androidx.core.content.ContextCompat;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -229,7 +230,7 @@ public class AlarmActivity extends BaseActivity
mDismissButton.setOnClickListener(this);
mAlarmAnimator = AnimatorUtils.getScaleAnimator(mAlarmButton, 1.0f, 0.0f);
- mSnoozeAnimator = getButtonAnimator(mSnoozeButton, Color.WHITE);
+ mSnoozeAnimator = getButtonAnimator(mSnoozeButton, mCurrentHourColor);
mDismissAnimator = getButtonAnimator(mDismissButton, mCurrentHourColor);
mPulseAnimator = ObjectAnimator.ofPropertyValuesHolder(pulseView,
PropertyValuesHolder.ofFloat(CircleView.RADIUS, 0.0f, pulseView.getRadius()),
@@ -504,7 +505,7 @@ public class AlarmActivity extends BaseActivity
R.plurals.alarm_alert_snooze_set, snoozeMinutes, snoozeMinutes);
getAlertAnimator(mSnoozeButton, R.string.alarm_alert_snoozed_text, infoText,
- accessibilityText, Color.DKGRAY, mCurrentHourColor).start();
+ accessibilityText, mCurrentHourColor, mCurrentHourColor).start();
AlarmStateManager.setSnoozeState(this, mAlarmInstance, false /* showToast */);
@@ -525,7 +526,7 @@ public class AlarmActivity extends BaseActivity
getAlertAnimator(mDismissButton, R.string.alarm_alert_off_text, null /* infoText */,
getString(R.string.alarm_alert_off_text) /* accessibilityText */,
- Color.DKGRAY, mCurrentHourColor).start();
+ mCurrentHourColor, mCurrentHourColor).start();
AlarmStateManager.deleteInstanceAndUpdateParent(this, mAlarmInstance);
@@ -575,7 +576,7 @@ public class AlarmActivity extends BaseActivity
PropertyValuesHolder.ofInt(AnimatorUtils.DRAWABLE_ALPHA,
BUTTON_DRAWABLE_ALPHA_DEFAULT, 255),
PropertyValuesHolder.ofObject(AnimatorUtils.DRAWABLE_TINT,
- AnimatorUtils.ARGB_EVALUATOR, Color.WHITE, tintColor));
+ AnimatorUtils.ARGB_EVALUATOR, ContextCompat.getColor(this, R.color.color_default_primary_text), tintColor));
}
private ValueAnimator getAlarmBounceAnimator(float translationX, final int hintResId) {
diff --git a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
index 59a26e08686000066f87103d8a2a7d8df348ed24..f6db75ac764e549a048675186e773424df850dd2 100644
--- a/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
+++ b/src/com/android/deskclock/alarms/dataadapter/ExpandedAlarmViewHolder.java
@@ -101,6 +101,7 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder {
final int weekday = weekdays.get(i);
dayButton.setText(UiDataModel.getUiDataModel().getShortWeekday(weekday));
dayButton.setContentDescription(UiDataModel.getUiDataModel().getLongWeekday(weekday));
+ dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
repeatDays.addView(dayButtonFrame);
dayButtons[i] = dayButton;
}
@@ -221,11 +222,10 @@ public final class ExpandedAlarmViewHolder extends AlarmItemViewHolder {
final CompoundButton dayButton = dayButtons[i];
if (alarm.daysOfWeek.isBitOn(weekdays.get(i))) {
dayButton.setChecked(true);
- dayButton.setTextColor(ThemeUtils.resolveColor(context,
- android.R.attr.windowBackground));
+ dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
} else {
dayButton.setChecked(false);
- dayButton.setTextColor(Color.WHITE);
+ dayButton.setTextColor(context.getApplicationContext().getResources().getColor(R.color.color_default_view_on_accent));
}
}
if (alarm.daysOfWeek.isRepeating()) {
diff --git a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
index 2ce37bdb8906d24006ec734a220eb42ece830a9b..e3d65c557145e26d173adb19c604c708217f2977 100644
--- a/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
+++ b/src/com/android/deskclock/ringtone/RingtoneViewHolder.java
@@ -86,7 +86,7 @@ final class RingtoneViewHolder extends ItemAdapter.ItemViewHolder laps = getLaps();
diff --git a/src/com/android/deskclock/timer/TimerCircleView.java b/src/com/android/deskclock/timer/TimerCircleView.java
index f605f91865705f6d67f8cd42afa786aeadb65273..c55cc88e4950e0b90bb0f98e5ae405834cb22edf 100644
--- a/src/com/android/deskclock/timer/TimerCircleView.java
+++ b/src/com/android/deskclock/timer/TimerCircleView.java
@@ -71,7 +71,7 @@ public final class TimerCircleView extends View {
mStrokeSize = resources.getDimension(R.dimen.circletimer_circle_size);
mRadiusOffset = Utils.calculateRadiusOffset(mStrokeSize, dotDiameter, 0);
- mRemainderColor = Color.WHITE;
+ mRemainderColor = ThemeUtils.resolveColor(context, R.attr.colorAccent);
mCompletedColor = ThemeUtils.resolveColor(context, R.attr.colorAccent);
mPaint.setAntiAlias(true);
@@ -102,6 +102,7 @@ public final class TimerCircleView extends View {
// Reset old painting state.
mPaint.setColor(mRemainderColor);
+ mPaint.setAlpha(100);
mPaint.setStrokeWidth(mStrokeSize);
// If the timer is reset, draw a simple white circle.
diff --git a/src/com/android/deskclock/widget/toast/SnackbarManager.java b/src/com/android/deskclock/widget/toast/SnackbarManager.java
index 95d91b2f60c130f8d2d225c55ee24f707d02ede1..0fa071f76baf0ca45f3bbbc4098a31f308b85512 100644
--- a/src/com/android/deskclock/widget/toast/SnackbarManager.java
+++ b/src/com/android/deskclock/widget/toast/SnackbarManager.java
@@ -17,9 +17,14 @@
package com.android.deskclock.widget.toast;
import com.google.android.material.snackbar.Snackbar;
+import android.view.View;
+import android.widget.TextView;
+import androidx.core.content.ContextCompat;
import java.lang.ref.WeakReference;
+import com.android.deskclock.R;
+
/**
* Manages visibility of Snackbar and allow preemptive dismiss of current displayed Snackbar.
*/
@@ -31,6 +36,11 @@ public final class SnackbarManager {
public static void show(Snackbar snackbar) {
sSnackbar = new WeakReference<>(snackbar);
+ View view = snackbar.getView();
+ view.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
+ TextView tv = (TextView) view.findViewById(com.google.android.material.R.id.snackbar_text);
+ tv.setTextColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_text));
+ tv.setBackgroundColor(ContextCompat.getColor(snackbar.getContext(), R.color.color_default_primary_dark));
snackbar.show();
}