From 8566a26429f8886e64b322e6920f2be9565be88f Mon Sep 17 00:00:00 2001
From: Hai Zhang <zhanghai@google.com>
Date: Mon, 10 May 2021 03:21:31 +0000
Subject: [PATCH] Set PreferenceThemeOverlay as preferenceTheme in
 Theme.SubSettingsBase on R.

Setting preferenceTheme is needed for using AndroidX preference, and the
S+ version of the theme is setting the S+ PreferenceTheme.SettingsLib as
well. So set the vanilla AndroidX PreferenceThemeOverlay as
preferenceTheme on R.

Bug: 177638625
Test: presubmit
Change-Id: Icbf676849e31619a1192b4f1724a5d2932650e06
---
 packages/SettingsLib/SettingsTheme/res/values/themes.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/SettingsLib/SettingsTheme/res/values/themes.xml b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
index 524892dc0f45d..e856aa1a27804 100644
--- a/packages/SettingsLib/SettingsTheme/res/values/themes.xml
+++ b/packages/SettingsLib/SettingsTheme/res/values/themes.xml
@@ -17,7 +17,9 @@
 
 <resources>
     <!-- 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 -->
     <style name="Theme.SubSettingsBase" parent="Theme.SettingsBase">
@@ -25,4 +27,4 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
     </style>
-</resources>
\ No newline at end of file
+</resources>