From 2a3837e4baa916ff19fe88f00fa518b31a3e347c Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 10 Jul 2021 14:17:16 +0600 Subject: [PATCH] DeskClock: Sync /e/ UI changes with Q branch * This is a combination of the following 5 commits. 3425-Q-Fix_theme_consistency 3649-Q-color_issue_in_light_mode 3808-Q-Forcefully_enable_dark_mode 3870-Q-snoozed_background_color_issue 3948-Q-Fix_timer_background_color_issue --- AndroidManifest.xml | 4 +- res/color/backspace_tint_color.xml | 4 +- res/color/tab_tint_color.xml | 6 +- res/drawable-ldrtl/ic_label.xml | 2 +- res/drawable-v21/bg_day_button_animatable.xml | 2 +- res/drawable-v21/bg_day_button_white.xml | 2 +- res/drawable-v21/ic_alarm_off_24dp.xml | 2 +- res/drawable-v21/ic_reset_24dp.xml | 2 +- res/drawable-v21/ic_snooze_24dp.xml | 2 +- res/drawable-v21/ic_sw_lap_24dp.xml | 2 +- res/drawable/action_bar_shadow.xml | 4 +- res/drawable/bg_actionbar.xml | 5 + res/drawable/bg_circle_white.xml | 2 +- res/drawable/clock_analog_dial.xml | 2 +- res/drawable/clock_analog_hour.xml | 2 +- res/drawable/clock_analog_minute.xml | 2 +- res/drawable/clock_analog_second.xml | 2 +- res/drawable/ic_add_24dp.xml | 2 +- res/drawable/ic_add_white_24dp.xml | 2 +- res/drawable/ic_alarm.xml | 8 +- res/drawable/ic_alarm_small.xml | 2 +- res/drawable/ic_arrow_back.xml | 10 ++ res/drawable/ic_backspace.xml | 4 +- res/drawable/ic_caret_down_static.xml | 4 +- res/drawable/ic_caret_up_static.xml | 4 +- res/drawable/ic_checkmark.xml | 2 +- res/drawable/ic_clock.xml | 6 +- res/drawable/ic_close.xml | 10 ++ res/drawable/ic_delete_small.xml | 6 +- res/drawable/ic_dismiss.xml | 2 +- res/drawable/ic_fab_alarm.xml | 4 +- res/drawable/ic_label.xml | 2 +- res/drawable/ic_magnifier.xml | 10 ++ res/drawable/ic_more_24.xml | 10 ++ res/drawable/ic_pause_24dp.xml | 4 +- res/drawable/ic_public.xml | 12 +- res/drawable/ic_ringtone.xml | 2 +- res/drawable/ic_ringtone_not_found.xml | 2 +- res/drawable/ic_ringtone_silent.xml | 2 +- res/drawable/ic_start_24dp.xml | 4 +- res/drawable/ic_stop_24dp.xml | 4 +- res/drawable/thumb_selector.xml | 2 +- res/drawable/track_selector.xml | 4 +- res/layout-land/clock_fragment.xml | 4 + res/layout-land/main_clock_frame.xml | 4 + res/layout-land/stopwatch_fragment.xml | 4 + res/layout-land/timer_setup_view.xml | 2 + res/layout-land/world_clock_item.xml | 4 + .../stopwatch_fragment.xml | 13 +- res/layout-w320dp-h320dp/timer_item.xml | 6 + res/layout/alarm_activity.xml | 12 +- res/layout/alarm_clock.xml | 3 + res/layout/alarm_row.xml | 7 +- res/layout/alarm_time_collapsed.xml | 9 +- res/layout/alarm_time_summary.xml | 4 +- res/layout/alarm_volume_preference.xml | 1 + res/layout/cities_activity.xml | 2 + res/layout/city_list_header.xml | 3 +- res/layout/city_list_item.xml | 8 +- res/layout/clock_fragment.xml | 1 + res/layout/custom_pref_dropdown_layout.xml | 66 +++++++++ res/layout/custom_pref_layout.xml | 55 +++++++ res/layout/custom_pref_switch_layout.xml | 67 +++++++++ res/layout/custom_settings_toolbar.xml | 22 +++ res/layout/date_and_next_alarm_time.xml | 4 + res/layout/day_button.xml | 1 + res/layout/desk_clock.xml | 44 +++--- res/layout/desk_clock_saver.xml | 7 +- res/layout/digital_widget.xml | 6 +- res/layout/digital_widget_sizer.xml | 8 +- res/layout/lap_view.xml | 4 + res/layout/loading_widget.xml | 2 +- res/layout/main_clock_frame.xml | 5 + res/layout/preemptive_dismiss.xml | 1 + res/layout/ringtone_item_header.xml | 1 + res/layout/ringtone_item_sound.xml | 9 +- res/layout/ringtone_picker.xml | 2 + res/layout/selection_layout.xml | 6 +- res/layout/settings.xml | 2 + res/layout/stopwatch_fragment.xml | 9 +- res/layout/stopwatch_time.xml | 5 + res/layout/timer_fragment.xml | 6 + res/layout/timer_item.xml | 9 ++ res/layout/timer_setup_container.xml | 1 + res/layout/timer_setup_digits.xml | 1 + res/layout/timer_setup_time.xml | 5 + res/layout/timer_setup_view.xml | 1 + res/layout/world_clock_city_container.xml | 3 + res/layout/world_clock_item.xml | 4 + res/layout/world_clock_remote_list_item.xml | 12 +- res/values-night-v27/themes.xml | 44 ++++++ res/values-night/colors.xml | 22 --- res/values-sw360dp-v13/values-preference.xml | 6 + res/values-v21/styles.xml | 2 +- res/values-v27/themes.xml | 44 ++++++ res/values/colors.xml | 34 ++--- res/values/styles.xml | 60 ++++++-- res/values/themes.xml | 134 ++++++++++++++++-- res/xml/settings.xml | 31 ++++ src/com/android/deskclock/BaseActivity.java | 12 +- src/com/android/deskclock/DeskClock.java | 3 + .../deskclock/DeskClockApplication.java | 4 + .../SearchMenuItemController.java | 9 ++ .../deskclock/alarms/AlarmActivity.java | 9 +- .../dataadapter/ExpandedAlarmViewHolder.java | 6 +- .../ringtone/RingtoneViewHolder.java | 2 +- .../deskclock/settings/SettingsActivity.java | 6 + .../settings/SimpleMenuPreference.java | 2 +- .../stopwatch/StopwatchCircleView.java | 3 +- .../deskclock/timer/TimerCircleView.java | 3 +- .../widget/toast/SnackbarManager.java | 10 ++ 111 files changed, 860 insertions(+), 212 deletions(-) create mode 100644 res/drawable/bg_actionbar.xml create mode 100644 res/drawable/ic_arrow_back.xml create mode 100644 res/drawable/ic_close.xml create mode 100644 res/drawable/ic_magnifier.xml create mode 100644 res/drawable/ic_more_24.xml create mode 100644 res/layout/custom_pref_dropdown_layout.xml create mode 100644 res/layout/custom_pref_layout.xml create mode 100644 res/layout/custom_pref_switch_layout.xml create mode 100644 res/layout/custom_settings_toolbar.xml create mode 100644 res/values-night-v27/themes.xml delete mode 100644 res/values-night/colors.xml create mode 100644 res/values-sw360dp-v13/values-preference.xml create mode 100644 res/values-v27/themes.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 27da155e7..434efa430 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" /> - - + + \ No newline at end of file diff --git a/res/color/tab_tint_color.xml b/res/color/tab_tint_color.xml index 279f24351..c37e4da1c 100644 --- a/res/color/tab_tint_color.xml +++ b/res/color/tab_tint_color.xml @@ -15,7 +15,7 @@ --> - - - + + + diff --git a/res/drawable-ldrtl/ic_label.xml b/res/drawable-ldrtl/ic_label.xml index a62018ea5..b0b647155 100644 --- a/res/drawable-ldrtl/ic_label.xml +++ b/res/drawable-ldrtl/ic_label.xml @@ -24,7 +24,7 @@ android:pivotX="12" android:scaleX="-1"> diff --git a/res/drawable-v21/bg_day_button_animatable.xml b/res/drawable-v21/bg_day_button_animatable.xml index 5f34ac8fc..4880bc99e 100644 --- a/res/drawable-v21/bg_day_button_animatable.xml +++ b/res/drawable-v21/bg_day_button_animatable.xml @@ -30,7 +30,7 @@ android:translateY="12"> \ No newline at end of file diff --git a/res/drawable-v21/bg_day_button_white.xml b/res/drawable-v21/bg_day_button_white.xml index 1ebfd57e2..13f9448ae 100644 --- a/res/drawable-v21/bg_day_button_white.xml +++ b/res/drawable-v21/bg_day_button_white.xml @@ -28,7 +28,7 @@ android:translateY="12"> \ No newline at end of file diff --git a/res/drawable-v21/ic_alarm_off_24dp.xml b/res/drawable-v21/ic_alarm_off_24dp.xml index 24e0b5f54..c39a0bafd 100644 --- a/res/drawable-v21/ic_alarm_off_24dp.xml +++ b/res/drawable-v21/ic_alarm_off_24dp.xml @@ -1,4 +1,4 @@ + android:tint="@color/gray1" /> diff --git a/res/drawable-v21/ic_reset_24dp.xml b/res/drawable-v21/ic_reset_24dp.xml index b88c04fa4..9474769be 100644 --- a/res/drawable-v21/ic_reset_24dp.xml +++ b/res/drawable-v21/ic_reset_24dp.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent_color" /> diff --git a/res/drawable-v21/ic_snooze_24dp.xml b/res/drawable-v21/ic_snooze_24dp.xml index 1968c6d7d..813ac1d0b 100644 --- a/res/drawable-v21/ic_snooze_24dp.xml +++ b/res/drawable-v21/ic_snooze_24dp.xml @@ -1,4 +1,4 @@ \ No newline at end of file + android:tint="@color/accent_color" /> \ No newline at end of file diff --git a/res/drawable-v21/ic_sw_lap_24dp.xml b/res/drawable-v21/ic_sw_lap_24dp.xml index 25b0e5095..cb32215c3 100644 --- a/res/drawable-v21/ic_sw_lap_24dp.xml +++ b/res/drawable-v21/ic_sw_lap_24dp.xml @@ -1,4 +1,4 @@ + android:tint="@color/accent_color" /> diff --git a/res/drawable/action_bar_shadow.xml b/res/drawable/action_bar_shadow.xml index fb3f2d97d..e4b190b57 100644 --- a/res/drawable/action_bar_shadow.xml +++ b/res/drawable/action_bar_shadow.xml @@ -22,8 +22,8 @@ android:shape="rectangle"> \ No newline at end of file diff --git a/res/drawable/bg_actionbar.xml b/res/drawable/bg_actionbar.xml new file mode 100644 index 000000000..0129145ea --- /dev/null +++ b/res/drawable/bg_actionbar.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/bg_circle_white.xml b/res/drawable/bg_circle_white.xml index e04b38bd4..df3daf820 100644 --- a/res/drawable/bg_circle_white.xml +++ b/res/drawable/bg_circle_white.xml @@ -17,5 +17,5 @@ - + \ No newline at end of file diff --git a/res/drawable/clock_analog_dial.xml b/res/drawable/clock_analog_dial.xml index 3145ab650..f5efdab47 100644 --- a/res/drawable/clock_analog_dial.xml +++ b/res/drawable/clock_analog_dial.xml @@ -20,6 +20,6 @@ android:viewportHeight="1176.0" android:viewportWidth="1176.0"> \ No newline at end of file diff --git a/res/drawable/clock_analog_hour.xml b/res/drawable/clock_analog_hour.xml index f71d84f3a..fb490b4af 100644 --- a/res/drawable/clock_analog_hour.xml +++ b/res/drawable/clock_analog_hour.xml @@ -20,6 +20,6 @@ android:viewportHeight="1176.0" android:viewportWidth="1176.0"> \ No newline at end of file diff --git a/res/drawable/clock_analog_minute.xml b/res/drawable/clock_analog_minute.xml index 8f63be392..d5e7cb43d 100644 --- a/res/drawable/clock_analog_minute.xml +++ b/res/drawable/clock_analog_minute.xml @@ -20,6 +20,6 @@ android:viewportHeight="1176.0" android:viewportWidth="1176.0"> diff --git a/res/drawable/clock_analog_second.xml b/res/drawable/clock_analog_second.xml index 295bf3fd1..1d7c6e6a7 100644 --- a/res/drawable/clock_analog_second.xml +++ b/res/drawable/clock_analog_second.xml @@ -21,6 +21,6 @@ android:viewportWidth="1176.0" android:tint="?attr/colorAccent"> \ No newline at end of file diff --git a/res/drawable/ic_add_24dp.xml b/res/drawable/ic_add_24dp.xml index bfbe7314f..f74f2a41b 100644 --- a/res/drawable/ic_add_24dp.xml +++ b/res/drawable/ic_add_24dp.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_add_white_24dp.xml b/res/drawable/ic_add_white_24dp.xml index 71ed3d7f5..f74f2a41b 100644 --- a/res/drawable/ic_add_white_24dp.xml +++ b/res/drawable/ic_add_white_24dp.xml @@ -20,6 +20,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/res/drawable/ic_alarm.xml b/res/drawable/ic_alarm.xml index 575b960fe..da245da5c 100644 --- a/res/drawable/ic_alarm.xml +++ b/res/drawable/ic_alarm.xml @@ -35,7 +35,7 @@ @@ -65,7 +65,7 @@ diff --git a/res/drawable/ic_alarm_small.xml b/res/drawable/ic_alarm_small.xml index dfc6e6340..fa2fceb2f 100644 --- a/res/drawable/ic_alarm_small.xml +++ b/res/drawable/ic_alarm_small.xml @@ -20,6 +20,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml new file mode 100644 index 000000000..9b2bf9658 --- /dev/null +++ b/res/drawable/ic_arrow_back.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_backspace.xml b/res/drawable/ic_backspace.xml index 1adc2d3c5..e91089794 100644 --- a/res/drawable/ic_backspace.xml +++ b/res/drawable/ic_backspace.xml @@ -19,11 +19,11 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:width="@dimen/backspace_icon_size" android:height="@dimen/backspace_icon_size" - android:tint="?attr/colorControlNormal" + android:tint="@color/accent_color" android:tintMode="src_in" android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_caret_down_static.xml b/res/drawable/ic_caret_down_static.xml index c61c85c5d..8a79e6447 100644 --- a/res/drawable/ic_caret_down_static.xml +++ b/res/drawable/ic_caret_down_static.xml @@ -37,7 +37,7 @@ android:translateY="-1"> @@ -53,7 +53,7 @@ android:translateY="1"> diff --git a/res/drawable/ic_caret_up_static.xml b/res/drawable/ic_caret_up_static.xml index 8eaa80e23..43df5424a 100644 --- a/res/drawable/ic_caret_up_static.xml +++ b/res/drawable/ic_caret_up_static.xml @@ -37,7 +37,7 @@ android:translateY="-1"> @@ -53,7 +53,7 @@ android:translateY="1"> diff --git a/res/drawable/ic_checkmark.xml b/res/drawable/ic_checkmark.xml index ed5c32dde..6a5c033e0 100644 --- a/res/drawable/ic_checkmark.xml +++ b/res/drawable/ic_checkmark.xml @@ -22,6 +22,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_clock.xml b/res/drawable/ic_clock.xml index 00999891d..6bcb273d7 100755 --- a/res/drawable/ic_clock.xml +++ b/res/drawable/ic_clock.xml @@ -39,7 +39,7 @@ + android:fillColor="@color/accent_color" /> @@ -58,7 +58,7 @@ android:translateY="-0.125" > @@ -79,7 +79,7 @@ android:translateY="-0.125" > diff --git a/res/drawable/ic_close.xml b/res/drawable/ic_close.xml new file mode 100644 index 000000000..f17475f44 --- /dev/null +++ b/res/drawable/ic_close.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/res/drawable/ic_delete_small.xml b/res/drawable/ic_delete_small.xml index c167952f0..1a0901558 100644 --- a/res/drawable/ic_delete_small.xml +++ b/res/drawable/ic_delete_small.xml @@ -20,12 +20,12 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_dismiss.xml b/res/drawable/ic_dismiss.xml index ba91772d1..f4535b830 100644 --- a/res/drawable/ic_dismiss.xml +++ b/res/drawable/ic_dismiss.xml @@ -20,6 +20,6 @@ android:viewportWidth="80.0" android:viewportHeight="80.0"> \ No newline at end of file diff --git a/res/drawable/ic_fab_alarm.xml b/res/drawable/ic_fab_alarm.xml index b61cf75b1..f1be9e729 100644 --- a/res/drawable/ic_fab_alarm.xml +++ b/res/drawable/ic_fab_alarm.xml @@ -20,9 +20,9 @@ android:viewportHeight="56.0" android:viewportWidth="56.0"> \ No newline at end of file diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml index 4a120f28b..1bb35ed62 100644 --- a/res/drawable/ic_label.xml +++ b/res/drawable/ic_label.xml @@ -21,6 +21,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_magnifier.xml b/res/drawable/ic_magnifier.xml new file mode 100644 index 000000000..468ab2db3 --- /dev/null +++ b/res/drawable/ic_magnifier.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_more_24.xml b/res/drawable/ic_more_24.xml new file mode 100644 index 000000000..50ea93209 --- /dev/null +++ b/res/drawable/ic_more_24.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_pause_24dp.xml b/res/drawable/ic_pause_24dp.xml index 83d4af745..4bd070e32 100644 --- a/res/drawable/ic_pause_24dp.xml +++ b/res/drawable/ic_pause_24dp.xml @@ -3,9 +3,9 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:tint="@color/white" + android:tint="@android:color/white" > diff --git a/res/drawable/ic_public.xml b/res/drawable/ic_public.xml index 6657b10e9..81c552e86 100644 --- a/res/drawable/ic_public.xml +++ b/res/drawable/ic_public.xml @@ -15,13 +15,13 @@ --> diff --git a/res/drawable/ic_ringtone.xml b/res/drawable/ic_ringtone.xml index 3b5443e4c..a75f0c2e5 100644 --- a/res/drawable/ic_ringtone.xml +++ b/res/drawable/ic_ringtone.xml @@ -20,6 +20,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> \ No newline at end of file diff --git a/res/drawable/ic_ringtone_not_found.xml b/res/drawable/ic_ringtone_not_found.xml index bc7ceebb2..997dbc759 100644 --- a/res/drawable/ic_ringtone_not_found.xml +++ b/res/drawable/ic_ringtone_not_found.xml @@ -20,6 +20,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_ringtone_silent.xml b/res/drawable/ic_ringtone_silent.xml index fa62afde7..c6381388f 100644 --- a/res/drawable/ic_ringtone_silent.xml +++ b/res/drawable/ic_ringtone_silent.xml @@ -20,6 +20,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/ic_start_24dp.xml b/res/drawable/ic_start_24dp.xml index 608c68061..6c8e44777 100644 --- a/res/drawable/ic_start_24dp.xml +++ b/res/drawable/ic_start_24dp.xml @@ -3,9 +3,9 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:tint="@color/white" + android:tint="@android:color/white" > diff --git a/res/drawable/ic_stop_24dp.xml b/res/drawable/ic_stop_24dp.xml index e771c17fa..3feac9bd8 100644 --- a/res/drawable/ic_stop_24dp.xml +++ b/res/drawable/ic_stop_24dp.xml @@ -3,9 +3,9 @@ android:height="24dp" android:viewportHeight="24.0" android:viewportWidth="24.0" - android:tint="@color/white" + android:tint="@color/accent_color" > diff --git a/res/drawable/thumb_selector.xml b/res/drawable/thumb_selector.xml index cdf0cbf89..0f13abd75 100644 --- a/res/drawable/thumb_selector.xml +++ b/res/drawable/thumb_selector.xml @@ -4,7 +4,7 @@ - + diff --git a/res/drawable/track_selector.xml b/res/drawable/track_selector.xml index 1174deb4d..d7b4183a8 100644 --- a/res/drawable/track_selector.xml +++ b/res/drawable/track_selector.xml @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/res/layout-land/clock_fragment.xml b/res/layout-land/clock_fragment.xml index a29a09da7..3ec4260a9 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 b72f62333..3b47836dc 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 e5e9398ea..f2bdcf579 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 869282426..1ca72180c 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 61bff3455..f4dbdb83e 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 eaf917805..2d42899c6 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 e6e6f7079..e314d4aa8 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 f80644558..5dde9826e 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 25c76b3d7..e815e8cea 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 e8e969f20..10fb90ca8 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 d80865d83..5c52bd888 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 2db78efff..b2b9efa9c 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 520ab328d..9fd7e1d53 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 d1b7619f2..4a3a2c32f 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 000000000..85c8467ed --- /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 000000000..7dba76f89 --- /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 000000000..766760a7f --- /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 ad25502a8..a38660145 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 9cebabfa5..1eac9e12f 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 bd898d034..7988e67dd 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">