commit 93031bc2ae40a9346bf8501be51bedd0bbdedd65
author Brian Isganitis <brianji@google.com> Wed Jun 09 16:34:45 2021 -0400
committer Brian Isganitis <brianji@google.com> Fri Jun 11 16:04:35 2021 -0400
tree 614e669404fdf3e9c0ca91d42dcf602812e69667
parent a51ef571add64065836c06e5c774529d96132d8e

Revert "Revert "Update preferences to Material Next styling""

There should be enough free space to merge this change into S V2.

This reverts commit 19d623d9210f2f75d25b860158da3ee6dfdd83db.

Test: Settings root, all apps, and about have new style on S
Bug: 187732263
Fix: 188254205, 188012913
Change-Id: I346bbf819f3fe1eb13b47125b53c15baab11e439

AndroidManifest-common.xml

diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index d725a16..4eecf29 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -144,7 +144,7 @@
         <activity
             android:name="com.android.launcher3.settings.SettingsActivity"
             android:label="@string/settings_button_text"
-            android:theme="@style/HomeSettingsTheme"
+            android:theme="@style/HomeSettings.Theme"
             android:exported="true"
             android:autoRemoveFromRecents="true">
             <intent-filter>