Only launch fingerprint settings after enrollment if it's from the summary controller (4c4bad8e) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricEnrollBase.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
		import android.annotation.Nullable;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.content.res.Resources.Theme;
		import android.graphics.Color;
		import android.os.Bundle;
		import android.os.UserHandle;
		@@ -44,6 +43,7 @@ import com.google.android.setupdesign.GlifLayout;
		*/
		public abstract class BiometricEnrollBase extends InstrumentedActivity {

		public static final String EXTRA_FROM_SETTINGS_SUMMARY = "from_settings_summary";
		public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
		public static final String EXTRA_KEY_REQUIRE_VISION = "accessibility_vision";
		public static final String EXTRA_KEY_REQUIRE_DIVERSITY = "accessibility_diversity";
		@@ -81,16 +81,20 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		protected boolean mLaunchedConfirmLock;
		protected byte[] mToken;
		protected int mUserId;
		protected boolean mFromSettingsSummary;
		protected FooterBarMixin mFooterBarMixin;

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		mToken = getIntent().getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
		mFromSettingsSummary = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS_SUMMARY, false);
		if (savedInstanceState != null && mToken == null) {
		mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
		mToken = savedInstanceState.getByteArray(
		ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
		mFromSettingsSummary =
		savedInstanceState.getBoolean(EXTRA_FROM_SETTINGS_SUMMARY, false);
		}
		mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
		}
		@@ -107,6 +111,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		super.onSaveInstanceState(outState);
		outState.putBoolean(EXTRA_KEY_LAUNCHED_CONFIRM, mLaunchedConfirmLock);
		outState.putByteArray(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
		outState.putBoolean(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		}

		@Override
		@@ -154,6 +159,7 @@ public abstract class BiometricEnrollBase extends InstrumentedActivity {
		Intent intent = new Intent();
		intent.setClassName(SETTINGS_PACKAGE_NAME, FingerprintEnrollEnrolling.class.getName());
		intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		if (mUserId != UserHandle.USER_NULL) {
		intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
		}

src/com/android/settings/biometrics/BiometricEnrollIntroduction.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
		if (mUserId != UserHandle.USER_NULL) {
		intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
		}
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
		}

src/com/android/settings/biometrics/BiometricStatusPreferenceController.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.settings.biometrics;

		import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
		import static com.android.settings.biometrics.BiometricEnrollBase.EXTRA_FROM_SETTINGS_SUMMARY;

		import android.content.Context;
		import android.content.Intent;
		@@ -118,6 +119,7 @@ public abstract class BiometricStatusPreferenceController extends BasePreference
		Intent intent = new Intent();
		intent.setClassName(SETTINGS_PACKAGE_NAME, clazz);
		intent.putExtra(Intent.EXTRA_USER_ID, userId);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, true);
		context.startActivity(intent);
		return true;
		});

src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -107,6 +107,7 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
		\| Intent.FLAG_ACTIVITY_CLEAR_TOP
		\| Intent.FLAG_ACTIVITY_SINGLE_TOP);
		intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
		intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
		if (mUserId != UserHandle.USER_NULL) {
		intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
		}

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,8 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
		setResult(RESULT_FINISHED);
		if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
		postEnroll();
		} else {
		} else if (mFromSettingsSummary) {
		// Only launch fingerprint settings if enrollment was triggered through settings summary
		launchFingerprintSettings();
		}
		finish();
		@@ -150,7 +151,7 @@ public class FingerprintEnrollFinish extends BiometricEnrollBase {
		final Intent intent = new Intent(ACTION_FINGERPRINT_SETTINGS);
		intent.setPackage(Utils.SETTINGS_PACKAGE_NAME);
		intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
		intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP \| Intent.FLAG_ACTIVITY_NEW_TASK);
		intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP \| Intent.FLAG_ACTIVITY_SINGLE_TOP);
		startActivity(intent);
		}