Merge "Hide background when identity check auth is requested" into main (c5e36291) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/MainClear.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -188,7 +188,7 @@ public class MainClear extends InstrumentedFragment implements OnGlobalLayoutLis
		false /* biometricsAuthenticationRequested */,
		userId)) {
		Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRICS_REQUEST,
		userId);
		userId, false /* hideBackground */);
		return;
		}
		}

src/com/android/settings/Utils.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
		import static android.text.format.DateUtils.FORMAT_SHOW_DATE;

		import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_AUTHENTICATORS;
		import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_HIDE_BACKGROUND;
		import static com.android.settings.password.ConfirmDeviceCredentialActivity.BIOMETRIC_PROMPT_NEGATIVE_BUTTON_TEXT;

		import android.app.ActionBar;
		@@ -1522,9 +1523,10 @@ public final class Utils extends com.android.settingslib.Utils {
		* @param fragment corresponding fragment of the surface
		* @param requestCode for starting the new activity
		* @param userId user id for the authentication request
		* @param hideBackground if the background activity screen needs to be hidden
		*/
		public static void launchBiometricPromptForMandatoryBiometrics(@NonNull Fragment fragment,
		int requestCode, int userId) {
		int requestCode, int userId, boolean hideBackground) {
		final Intent intent = new Intent();
		intent.putExtra(BIOMETRIC_PROMPT_AUTHENTICATORS,
		BiometricManager.Authenticators.MANDATORY_BIOMETRICS);
		@@ -1534,6 +1536,7 @@ public final class Utils extends com.android.settingslib.Utils {
		fragment.getString(R.string.mandatory_biometrics_prompt_description));
		intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, true);
		intent.putExtra(EXTRA_USER_ID, userId);
		intent.putExtra(BIOMETRIC_PROMPT_HIDE_BACKGROUND, hideBackground);
		intent.setClassName(SETTINGS_PACKAGE_NAME,
		ConfirmDeviceCredentialActivity.InternalActivity.class.getName());
		fragment.startActivityForResult(intent, requestCode);

src/com/android/settings/biometrics/combination/BiometricsSettingsBase.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ public abstract class BiometricsSettingsBase extends DashboardFragment {
		mBiometricsAuthenticationRequested, mUserId)) {
		mBiometricsAuthenticationRequested = true;
		Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
		mUserId);
		mUserId, true /* hideBackground */);
		}

		updateUnlockPhonePreferenceSummary();
		@@ -166,7 +166,7 @@ public abstract class BiometricsSettingsBase extends DashboardFragment {
		&& mGkPwHandle != 0L) {
		mBiometricsAuthenticationRequested = true;
		Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
		mUserId);
		mUserId, true /* hideBackground */);
		}
		if (!mConfirmCredential) {
		mDoNotFinishActivity = false;

src/com/android/settings/biometrics/face/FaceSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ public class FaceSettings extends DashboardFragment {
		mUserId)) {
		mBiometricsAuthenticationRequested = true;
		Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
		mUserId);
		mUserId, true /* hideBackground */);
		} else {
		mAttentionController.setToken(mToken);
		mEnrollController.setToken(mToken);

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -489,7 +489,7 @@ public class FingerprintSettings extends SubSettings {
		mUserId)) {
		mBiometricsAuthenticationRequested = true;
		Utils.launchBiometricPromptForMandatoryBiometrics(this, BIOMETRIC_AUTH_REQUEST,
		mUserId);
		mUserId, true /* hideBackground */);
		} else if (!mHasFirstEnrolled) {
		mIsEnrolling = true;
		addFirstFingerprint(null);
		@@ -784,7 +784,7 @@ public class FingerprintSettings extends SubSettings {
		mUserId)) {
		mBiometricsAuthenticationRequested = true;
		Utils.launchBiometricPromptForMandatoryBiometrics(this,
		BIOMETRIC_AUTH_REQUEST, mUserId);
		BIOMETRIC_AUTH_REQUEST, mUserId, true /* hideBackground */);
		}
		}