From b9fefba02acb33dd33a0a8d6cf2e716bc6125674 Mon Sep 17 00:00:00 2001 From: menghanli Date: Thu, 20 May 2021 11:27:03 +0800 Subject: [PATCH] Apply color extraction for vision settings Bug: 183713013 Test: Run initBCTestEnv_S.sh and apply different color Change-Id: I2420a6af0f0f975396003e4c5531701bfb8373f4 --- .../AccessibilitySettingsForSetupWizardActivity.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index b28e2bf05cb..2d58bedf2e8 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.content.ComponentName; -import android.content.res.Resources; import android.os.Bundle; import android.util.Log; import android.view.Menu; @@ -37,6 +36,7 @@ import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settingslib.core.instrumentation.Instrumentable; import com.google.android.setupcompat.util.WizardManagerHelper; +import com.google.android.setupdesign.util.ThemeHelper; public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity { @@ -99,7 +99,8 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit @Override protected void onCreate(Bundle savedState) { super.onCreate(savedState); - + setTheme(SetupWizardUtils.getTheme(this, getIntent())); + ThemeHelper.trySetDynamicColor(this); tryLaunchFontSizeSettings(); findViewById(R.id.content_parent).setFitsSystemWindows(false); } @@ -125,11 +126,4 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit finish(); } } - - @Override - protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) { - final int new_resid = SetupWizardUtils.getTheme(this, getIntent()); - theme.applyStyle(R.style.SetupWizardPartnerResource, true); - super.onApplyThemeResource(theme, new_resid, first); - } }