Merge "Set the theme in BiometricEnrollIntroduction" into qt-dev (76ffb2df) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SetupWizardUtils.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,11 +25,16 @@ import com.google.android.setupdesign.util.ThemeHelper;

		public class SetupWizardUtils {

		public static int getTheme(Intent intent) {
		public static String getThemeString(Intent intent) {
		String theme = intent.getStringExtra(WizardManagerHelper.EXTRA_THEME);
		if (theme == null) {
		theme = SetupWizardProperties.theme().orElse("");
		}
		return theme;
		}

		public static int getTheme(Intent intent) {
		String theme = getThemeString(intent);
		// TODO(yukl): Move to ThemeResolver and add any additional required attributes in
		// onApplyThemeResource using Theme overlays
		if (theme != null) {

+10 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.widget.TextView;

		import com.android.internal.widget.LockPatternUtils;
		import com.android.settings.R;
		import com.android.settings.SetupWizardUtils;
		import com.android.settings.password.ChooseLockGeneric;
		import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
		import com.android.settings.password.ChooseLockSettingsHelper;
		@@ -123,6 +124,15 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);

		Intent intent = getIntent();
		if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) {
		// Put the theme in the intent so it gets propagated to other activities in the flow
		intent.putExtra(
		WizardManagerHelper.EXTRA_THEME,
		SetupWizardUtils.getThemeString(intent));
		}

		mBiometricUnlockDisabledByAdmin = isDisabledByAdmin();

		setContentView(getLayoutResource());