Merge "Add a new SettingsCategoryPreference style" into rvc-dev am: ae1ed2508a am: a4b29edb79 am: eb4a0e7507 am: 777ff5f628

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11818499

Change-Id: I5bf1286dfc43cbb919153288321f25a871d1595c
This commit is contained in:
TreeHugger Robot
2020-06-11 12:24:52 +00:00
committed by Automerger Merge Worker

View File

@@ -27,11 +27,14 @@
<item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item> <item name="twoStateButtonPreferenceStyle">@style/TwoStateButtonPreference</item>
<item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle <item name="preferenceCategoryTitleTextAppearance">@style/TextAppearance.CategoryTitle
</item> </item>
<item name="preferenceCategoryStyle">@style/SettingsCategoryPreference</item>
<!-- For preference category color --> <!-- For preference category color -->
<item name="preferenceCategoryTitleTextColor">?android:attr/textColorSecondary</item> <item name="preferenceCategoryTitleTextColor">?android:attr/textColorSecondary</item>
<item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item> <item name="preferenceFragmentCompatStyle">@style/SettingsPreferenceFragmentStyle</item>
</style> </style>
<style name="SettingsCategoryPreference" parent="Preference.Category.Material" />
<style name="PreferenceTheme.SetupWizard"> <style name="PreferenceTheme.SetupWizard">
<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item> <item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
<item name="preferenceStyle">@style/Preference.Material</item> <item name="preferenceStyle">@style/Preference.Material</item>