Merge "SUW - Apply theme to FRP PIN pages" into sc-dev (0ddacf11) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/password/ChooseLockSettingsHelper.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -359,21 +359,22 @@ public final class ChooseLockSettingsHelper {
		requestGatekeeperPasswordHandle);

		intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName());

		Intent inIntent = mFragment != null ? mFragment.getActivity().getIntent() :
		mActivity.getIntent();
		copyInternalExtras(inIntent, intent);
		if (external) {
		intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
		copyOptionalExtras(inIntent, intent);
		if (mFragment != null) {
		copyOptionalExtras(mFragment.getActivity().getIntent(), intent);
		mFragment.startActivity(intent);
		} else {
		copyOptionalExtras(mActivity.getIntent(), intent);
		mActivity.startActivity(intent);
		}
		} else {
		if (mFragment != null) {
		copyInternalExtras(mFragment.getActivity().getIntent(), intent);
		mFragment.startActivityForResult(intent, request);
		} else {
		copyInternalExtras(mActivity.getIntent(), intent);
		mActivity.startActivityForResult(intent, request);
		}
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,8 @@ import com.android.settings.SettingsActivity;
		import com.android.settings.SetupWizardUtils;
		import com.android.settings.Utils;

		import com.google.android.setupdesign.util.ThemeHelper;

		public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivity {

		private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
		@@ -74,6 +76,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		setTheme(SetupWizardUtils.getTheme(this, getIntent()));
		mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
		}
		ThemeHelper.trySetDynamicColor(this);
		super.onCreate(savedState);

		if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {