From 290c3850622695ecfc4ba4e60f7559a9ee7b9d32 Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Thu, 8 Apr 2021 00:10:29 +0800
Subject: [PATCH] Tweak SettingsTheme

- Create SettingsPreferenceTheme to avoid resource conflicted in
  another source path.
- Follow UX suggestion to adjust listItemPaddingEnd

Bug: 184744354
Test: manual
Change-Id: I41abd2e8f830db3cd76307bf536d90d571af2be9
---
 .../SettingsTheme/res/values-v31/dimens.xml         |  2 +-
 .../SettingsTheme/res/values/styles_preference.xml  | 13 +++++++++++++
 .../SettingsLib/SettingsTheme/res/values/themes.xml |  2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml b/packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml
index 17b68050a3cc3..d092666f972c4 100644
--- a/packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values-v31/dimens.xml
@@ -19,7 +19,7 @@
     <dimen name="preference_title_font_size">20sp</dimen>
     <dimen name="icon_min_width">48dp</dimen>
     <dimen name="preference_padding_start">24dp</dimen>
-    <dimen name="preference_padding_end">24dp</dimen>
+    <dimen name="preference_padding_end">16dp</dimen>
     <dimen name="app_preference_padding_start">20dp</dimen>
     <dimen name="app_icon_min_width">52dp</dimen>
 </resources>
diff --git a/packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml b/packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml
index 17596ac2903a0..dcbdc07d1335b 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/styles_preference.xml
@@ -15,6 +15,7 @@
   limitations under the License.
   -->
 <resources>
+    <!--DEPRECATED. It will remove after all of client team migrated to new style. -->
     <style name="PreferenceTheme" parent="@style/PreferenceThemeOverlay">
         <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
         <item name="preferenceStyle">@style/SettingsPreference</item>
@@ -27,6 +28,18 @@
         <item name="footerPreferenceStyle">@style/Preference.Material</item>
     </style>
 
+    <style name="SettingsPreferenceTheme" parent="@style/PreferenceThemeOverlay">
+        <item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
+        <item name="preferenceStyle">@style/SettingsPreference</item>
+        <item name="checkBoxPreferenceStyle">@style/SettingsCheckBoxPreference</item>
+        <item name="dialogPreferenceStyle">@style/SettingsPreference</item>
+        <item name="editTextPreferenceStyle">@style/SettingsEditTextPreference</item>
+        <item name="dropdownPreferenceStyle">@style/SettingsDropdownPreference</item>
+        <item name="switchPreferenceStyle">@style/SettingsSwitchPreference</item>
+        <item name="seekBarPreferenceStyle">@style/SettingsSeekbarPreference</item>
+        <item name="footerPreferenceStyle">@style/Preference.Material</item>
+    </style>
+
     <style name="SettingsCategoryPreference" parent="@style/Preference.Category.Material">
         <item name="iconSpaceReserved">@bool/config_icon_space_reserved</item>
         <item name="allowDividerAbove">@bool/config_allow_divider</item>
diff --git a/packages/SettingsLib/SettingsTheme/res/values/themes.xml b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
index 36ca684a14a39..13c7523317fee 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
@@ -21,7 +21,7 @@
         <item name="android:textAppearanceListItem">@style/TextAppearance.PreferenceTitle</item>
         <item name="android:listPreferredItemPaddingStart">@dimen/preference_padding_start</item>
         <item name="android:listPreferredItemPaddingEnd">@dimen/preference_padding_end</item>
-        <item name="preferenceTheme">@style/PreferenceTheme</item>
+        <item name="preferenceTheme">@style/SettingsPreferenceTheme</item>
     </style>
 
     <!-- Using in SubSettings page including injected settings page -->