Customization entry layout (1/2)
1. Correct the background ripple color
2. Fine tune the layout dimensions
Test: Manually tested.
Bug: 337941334
Flag: com.android.wallpaper.new_picker_ui_flag
Change-Id: I6ed1250c75820d9ef4e6188bc0956ba2898e332c
diff --git a/res/layout/customization_option_entry_app_grid.xml b/res/layout/customization_option_entry_app_grid.xml
index bc8b8fd..c31b2a2 100644
--- a/res/layout/customization_option_entry_app_grid.xml
+++ b/res/layout/customization_option_entry_app_grid.xml
@@ -25,7 +25,7 @@
<TextView
android:id="@+id/option_entry_app_grid_title"
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/grid_title"
@@ -38,7 +38,7 @@
<TextView
android:id="@+id/option_entry_app_grid_description"
- style="@style/SectionSubtitleTextStyle"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
diff --git a/res/layout/customization_option_entry_app_shape.xml b/res/layout/customization_option_entry_app_shape.xml
index 66d9b07..965b0a1 100644
--- a/res/layout/customization_option_entry_app_shape.xml
+++ b/res/layout/customization_option_entry_app_shape.xml
@@ -24,7 +24,7 @@
android:clickable="true">
<TextView
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/preview_name_shape"
diff --git a/res/layout/customization_option_entry_clock.xml b/res/layout/customization_option_entry_clock.xml
index 4c56916..c302965 100644
--- a/res/layout/customization_option_entry_clock.xml
+++ b/res/layout/customization_option_entry_clock.xml
@@ -24,7 +24,7 @@
android:clickable="true">
<TextView
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/clock_title"
diff --git a/res/layout/customization_option_entry_colors.xml b/res/layout/customization_option_entry_colors.xml
index cd32e74..3046173 100644
--- a/res/layout/customization_option_entry_colors.xml
+++ b/res/layout/customization_option_entry_colors.xml
@@ -24,7 +24,7 @@
android:clickable="true">
<TextView
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/color_picker_title"
diff --git a/res/layout/customization_option_entry_keyguard_quick_affordance.xml b/res/layout/customization_option_entry_keyguard_quick_affordance.xml
index aa8152d..475c8e5 100644
--- a/res/layout/customization_option_entry_keyguard_quick_affordance.xml
+++ b/res/layout/customization_option_entry_keyguard_quick_affordance.xml
@@ -26,7 +26,7 @@
<TextView
android:id="@+id/option_entry_keyguard_quick_affordance_title"
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/keyguard_quick_affordance_title"
@@ -39,7 +39,7 @@
<TextView
android:id="@+id/option_entry_keyguard_quick_affordance_description"
- style="@style/SectionSubtitleTextStyle"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
diff --git a/res/layout/customization_option_entry_more_lock_settings.xml b/res/layout/customization_option_entry_more_lock_settings.xml
index 6ddbe7e..518af78 100644
--- a/res/layout/customization_option_entry_more_lock_settings.xml
+++ b/res/layout/customization_option_entry_more_lock_settings.xml
@@ -20,12 +20,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
- android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding_large"
android:clickable="true">
<TextView
android:id="@+id/option_entry_more_lock_settings_title"
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/more_settings_section_title"
@@ -37,7 +37,7 @@
<TextView
android:id="@+id/option_entry_more_lock_settings_description"
- style="@style/SectionSubtitleTextStyle"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/more_settings_section_description"
diff --git a/res/layout/customization_option_entry_show_notifications.xml b/res/layout/customization_option_entry_show_notifications.xml
index 2a482e8..b067131 100644
--- a/res/layout/customization_option_entry_show_notifications.xml
+++ b/res/layout/customization_option_entry_show_notifications.xml
@@ -21,11 +21,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
- android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding_large"
android:clickable="true">
<TextView
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/show_notifications_on_lock_screen"
diff --git a/res/layout/customization_option_entry_themed_icons.xml b/res/layout/customization_option_entry_themed_icons.xml
index 683fb0a..06461dc 100644
--- a/res/layout/customization_option_entry_themed_icons.xml
+++ b/res/layout/customization_option_entry_themed_icons.xml
@@ -21,12 +21,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/customization_option_entry_horizontal_padding"
- android:paddingVertical="@dimen/customization_option_entry_vertical_padding"
+ android:paddingVertical="@dimen/customization_option_entry_vertical_padding_large"
android:clickable="true">
<TextView
android:id="@+id/option_entry_themed_icons_title"
- style="@style/SectionTitleTextStyle"
+ style="@style/CustomizationOptionEntryTitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/themed_icon_title"
@@ -39,7 +39,7 @@
<TextView
android:id="@+id/option_entry_themed_icons_description"
- style="@style/SectionSubtitleTextStyle"
+ style="@style/CustomizationOptionEntrySubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/customization_option_entry_text_margin_end"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c2710f6..fc2fd8a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -130,6 +130,18 @@
<item name="android:lineHeight">16sp</item>
</style>
+ <style name="CustomizationOptionEntryTitleTextStyle">
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+ <item name="android:textColor">@color/system_on_surface</item>
+ <item name="android:textSize">20sp</item>
+ </style>
+
+ <style name="CustomizationOptionEntrySubtitleTextStyle">
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
+ <item name="android:textColor">@color/system_on_surface_variant</item>
+ <item name="android:textSize">14sp</item>
+ </style>
+
<style name="BetaTagTextStyle" parent="SectionTitleTextStyle">
<item name="android:textSize">12sp</item>
<item name="android:lineHeight">15dp</item>