Merge "Revert "(1/n) Fix Wrong button color in lockscreen dialog."" into main (d831b90b) · Commits · e / os / android_packages_apps_Settings

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

+18 −49

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import com.android.settings.Utils;
		import com.android.settings.biometrics.BiometricUtils;
		import com.android.settings.core.instrumentation.InstrumentedDialogFragment;

		import com.google.android.material.dialog.MaterialAlertDialogBuilder;
		public class SetupSkipDialog extends InstrumentedDialogFragment
		implements DialogInterface.OnClickListener {

		@@ -78,23 +77,14 @@ public class SetupSkipDialog extends InstrumentedDialogFragment

		@Override
		public Dialog onCreateDialog(Bundle savedInstanceState) {
		if (BiometricUtils.isExpressiveStyle(getContext(), false)) {
		final MaterialAlertDialogBuilder meterialBuilder =
		(MaterialAlertDialogBuilder) onCreateDialogBuilder();
		return meterialBuilder.create();
		} else {
		final AlertDialog.Builder alertDialogBuilder =
		(AlertDialog.Builder) onCreateDialogBuilder();
		return alertDialogBuilder.create();
		}
		return onCreateDialogBuilder().create();
		}

		@SuppressWarnings("TypeParameterUnusedInFormals")
		private <T> T getBiometricsBuilder(
		private AlertDialog.Builder getBiometricsBuilder(
		@LockPatternUtils.CredentialType int credentialType, boolean isSuw, boolean hasFace,
		boolean hasFingerprint) {
		final boolean isFaceSupported = hasFace && (!isSuw
		\|\| BiometricUtils.isFaceSupportedInSuw(getContext()));
		final boolean isFaceSupported = hasFace && (!isSuw \|\| BiometricUtils.isFaceSupportedInSuw(
		getContext()));
		final int msgResId;
		final int screenLockResId;
		switch (credentialType) {
		@@ -112,27 +102,16 @@ public class SetupSkipDialog extends InstrumentedDialogFragment
		msgResId = getPinSkipMessageRes(hasFace && isFaceSupported, hasFingerprint);
		break;
		}

		if (BiometricUtils.isExpressiveStyle(getContext(), false)) {
		return (T) new MaterialAlertDialogBuilder(getContext())
		.setPositiveButton(R.string.skip_lock_screen_dialog_button_label, this)
		.setNegativeButton(R.string.cancel_lock_screen_dialog_button_label, this)
		.setTitle(getSkipSetupTitle(screenLockResId, hasFingerprint,
		hasFace && isFaceSupported))
		.setMessage(msgResId);
		} else {
		return (T) new AlertDialog.Builder(getContext())
		return new AlertDialog.Builder(getContext())
		.setPositiveButton(R.string.skip_lock_screen_dialog_button_label, this)
		.setNegativeButton(R.string.cancel_lock_screen_dialog_button_label, this)
		.setTitle(getSkipSetupTitle(screenLockResId, hasFingerprint,
		hasFace && isFaceSupported))
		.setMessage(msgResId);
		}
		}

		@NonNull
		@SuppressWarnings("TypeParameterUnusedInFormals")
		public <T> T onCreateDialogBuilder() {
		public AlertDialog.Builder onCreateDialogBuilder() {
		Bundle args = getArguments();
		final boolean isSuw = args.getBoolean(EXTRA_KEY_IS_SUW);
		final boolean forBiometrics = args.getBoolean(EXTRA_KEY_FOR_BIOMETRICS);
		@@ -147,23 +126,13 @@ public class SetupSkipDialog extends InstrumentedDialogFragment
		return getBiometricsBuilder(credentialType, isSuw, hasFace, hasFingerprint);
		}

		final int msg = args.getBoolean(ARG_FRP_SUPPORTED)
		? R.string.lock_screen_intro_skip_dialog_text_frp
		: R.string.lock_screen_intro_skip_dialog_text;
		if (BiometricUtils.isExpressiveStyle(getContext(), false)) {
		return (T) new MaterialAlertDialogBuilder(getContext())
		.setPositiveButton(R.string.skip_anyway_button_label, this)
		.setNegativeButton(R.string.go_back_button_label, this)
		.setTitle(R.string.lock_screen_intro_skip_title)
		.setMessage(msg);

		} else {
		return (T) new AlertDialog.Builder(getContext())
		return new AlertDialog.Builder(getContext())
		.setPositiveButton(R.string.skip_anyway_button_label, this)
		.setNegativeButton(R.string.go_back_button_label, this)
		.setTitle(R.string.lock_screen_intro_skip_title)
		.setMessage(msg);
		}
		.setMessage(args.getBoolean(ARG_FRP_SUPPORTED) ?
		R.string.lock_screen_intro_skip_dialog_text_frp :
		R.string.lock_screen_intro_skip_dialog_text);
		}

		@StringRes