Merge "feat(expressive): Apply expressive theme correctly in SUW" into main (9f169fd6) · Commits · e / os / android_packages_apps_Settings

res/values/themes_suw.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,14 @@
		<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
		</style>

		<!-- This theme was applied to Settings pages which are running under SUW. -->
		<style name="SettingsPreferenceTheme.SetupWizard.Expressive" parent="PreferenceTheme.SettingsLib.Expressive">
		<item name="android:clipToPadding">true</item>
		<item name="android:clipChildren">true</item>
		<item name="preferenceTheme">@style/PreferenceTheme.SettingsLib.Expressive</item>
		<item name="preferenceFragmentCompatStyle">@style/SetupWizardPreferenceFragmentStyle</item>
		</style>

		<!-- DayNight themes -->
		<style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
		<style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />

+9 −2

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import com.android.settings.core.SubSettingLauncher;
		import com.android.settings.search.actionbar.SearchMenuController;
		import com.android.settings.support.actionbar.HelpResourceProvider;
		import com.android.settingslib.core.instrumentation.Instrumentable;
		import com.android.settingslib.widget.SettingsThemeHelper;

		import com.google.android.setupcompat.util.WizardManagerHelper;
		import com.google.android.setupdesign.util.ThemeHelper;
		@@ -89,15 +90,21 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit

		@Override
		protected void onCreate(Bundle savedState) {
		super.onCreate(savedState);
		// Custom theme needs to be set before any view is inflated, so that the theme would
		// apply correctly including when the configuration changes.
		applyTheme();
		super.onCreate(savedState);
		findViewById(R.id.content_parent).setFitsSystemWindows(false);
		}

		private void applyTheme() {
		final boolean isAnySetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
		if (isAnySetupWizard) {
		if (SettingsThemeHelper.isExpressiveTheme(this)) {
		setTheme(R.style.SettingsPreferenceTheme_SetupWizard_Expressive);
		} else {
		setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
		}
		ThemeHelper.trySetSuwTheme(this);
		}
		}

+12 −5

Original line number	Diff line number	Diff line
		@@ -99,6 +99,18 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
		if (isAnySetupWizard) {
		TransitionHelper.applyForwardTransition(this);
		TransitionHelper.applyBackwardTransition(this);

		// Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
		if (this instanceof SubSettings) {
		// setTheme needs to be called before inflating any views (e.g. before calling
		// super.onCreate)
		if (SettingsThemeHelper.isExpressiveTheme(this)) {
		setTheme(R.style.SettingsPreferenceTheme_SetupWizard_Expressive);
		} else {
		setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
		}
		ThemeHelper.trySetSuwTheme(this);
		}
		}
		super.onCreate(savedInstanceState);
		if (isFinishing()) {
		@@ -123,11 +135,6 @@ public class SettingsBaseActivity extends FragmentActivity implements CategoryHa
		if (!theme.getBoolean(android.R.styleable.Theme_windowNoTitle, false)) {
		requestWindowFeature(Window.FEATURE_NO_TITLE);
		}
		// Apply SetupWizard light theme during setup flow. This is for SubSettings pages.
		if (isAnySetupWizard && this instanceof SubSettings) {
		setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
		ThemeHelper.trySetSuwTheme(this);
		}

		if (isToolbarEnabled() && !isAnySetupWizard) {
		int resId = SettingsThemeHelper.isExpressiveTheme(getApplicationContext())