Merge "Set PreferenceThemeOverlay as preferenceTheme in Theme.SubSettingsBase on R." into sc-dev am: 9f60cc780d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14474589

Change-Id: I2edce553e023abe0aa9867a1dcba31060cd4c7e4
This commit is contained in:
TreeHugger Robot
2021-05-10 07:00:40 +00:00
committed by Automerger Merge Worker

View File

@@ -17,7 +17,9 @@
<resources> <resources>
<!-- Only using in Settings application --> <!-- Only using in Settings application -->
<style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" /> <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings">
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
</style>
<!-- Using in SubSettings page including injected settings page --> <!-- Using in SubSettings page including injected settings page -->
<style name="Theme.SubSettingsBase" parent="Theme.SettingsBase"> <style name="Theme.SubSettingsBase" parent="Theme.SettingsBase">
@@ -25,4 +27,4 @@
<item name="android:windowActionBar">false</item> <item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
</style> </style>
</resources> </resources>