Update clock color UI text & spacing
Flag: com.android.systemui.shared.new_customization_picker_ui
Test: manually verified
Bug: 350718184
Change-Id: If15d217960237dbebe9a9ee3aa160f6836ca3bc3
diff --git a/res/layout/floating_sheet_clock_color_content.xml b/res/layout/floating_sheet_clock_color_content.xml
index 3711b92..acd274a 100644
--- a/res/layout/floating_sheet_clock_color_content.xml
+++ b/res/layout/floating_sheet_clock_color_content.xml
@@ -23,12 +23,29 @@
android:clipToPadding="false"
android:clipChildren="false">
+ <TextView
+ android:id="@+id/clock_color_title"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/clock_color_title"
+ android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding" />
+
+ <TextView
+ android:id="@+id/clock_color_description"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"
+ android:text="@string/clock_color_description"
+ android:layout_marginBottom="16dp" />
+
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:clipChildren="false"
- android:layout_marginBottom="@dimen/floating_sheet_clock_color_option_list_bottom_margin">
+ android:layout_marginBottom="20dp">
<!--
This is an invisible placeholder put in place so that the parent keeps its height
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index be1e071..756ae2d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -200,7 +200,6 @@
<dimen name="floating_sheet_clock_edit_icon_margin">-18dp</dimen>
<dimen name="floating_sheet_clock_style_thumbnail_margin_bottom">12dp</dimen>
<dimen name="floating_sheet_clock_style_clock_size_text_margin_end">16dp</dimen>
- <dimen name="floating_sheet_clock_color_option_list_bottom_margin">12dp</dimen>
<dimen name="floating_sheet_color_option_size">54dp</dimen>
<dimen name="floating_sheet_color_option_stroke_width">3dp</dimen>
<dimen name="customization_option_entry_shortcut_icon_size">20dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b2ff8ac..8fdc97e 100755
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -51,6 +51,12 @@
<!-- Title of a tab to change the clock color. [CHAR LIMIT=15] -->
<string name="clock_color">Color</string>
+ <!-- Title of a bottom sheet for changing the clock color. [CHAR LIMIT=15] -->
+ <string name="clock_color_title">Clock color</string>
+
+ <!-- Description of a bottom sheet for changing the clock color. [CHAR LIMIT=55] -->
+ <string name="clock_color_description">Match the wallpaper theme or choose your own color</string>
+
<!-- Title of a clock color red option that will appear in the description of the custom clock section. [CHAR LIMIT=15] -->
<string name="clock_color_red">Red</string>