commit d3cd751f024137d68b9bf47cac5f1f714715925a
author Tsung-Mao Fang <tmfang@google.com> Wed May 05 15:43:54 2021 +0800
committer Tsung-Mao Fang <tmfang@google.com> Wed May 05 18:14:48 2021 +0800
tree 3728cab1bef8f9023f92107fcec1e7e941fe62f9
parent da602e196e8739f4905c07abb8c6161f41c21edf

Apply dynamic color for Erase all data(factory reset screen

Enable the dynamic color flag, and remove some unused theme in layout.

Test: Rebuilt apk and see the screen
Fix: 185557130
Change-Id: I7ed73c808be4942e5ffd461982e73a4ff7f7f2db

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index d28f86d..23fbf08 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -28,6 +28,8 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.security.SecuritySettingsFeatureProvider;
 
+import com.google.android.setupdesign.util.ThemeHelper;
+
 /**
  * Top-level Settings activity
  */
@@ -164,6 +166,7 @@
         @Override
         protected void onCreate(Bundle savedState) {
             setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            ThemeHelper.trySetDynamicColor(this);
             super.onCreate(savedState);
         }
 
@@ -176,6 +179,7 @@
         @Override
         protected void onCreate(Bundle savedState) {
             setTheme(SetupWizardUtils.getTheme(this, getIntent()));
+            ThemeHelper.trySetDynamicColor(this);
             super.onCreate(savedState);
         }