Merge "Cancel enrollment when back or negative buttons pressed" into sc-dev (08b78331) · Commits · e / os / android_packages_apps_Settings

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

+11 −6

Original line number	Diff line number	Diff line
		@@ -89,6 +89,17 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase

		@Override
		public void onBackPressed() {
		cancelEnrollment();
		super.onBackPressed();
		}

		protected void onSkipButtonClick(View view) {
		cancelEnrollment();
		setResult(RESULT_SKIP);
		finish();
		}

		public void cancelEnrollment() {
		if (mSidecar != null) {
		mSidecar.setListener(null);
		mSidecar.cancelEnrollment();
		@@ -96,12 +107,6 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
		.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
		mSidecar = null;
		}
		super.onBackPressed();
		}

		protected void onSkipButtonClick(View view) {
		setResult(RESULT_SKIP);
		finish();
		}

		public void startEnrollment() {

+17 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,12 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		}
		}

		@Override
		public void onBackPressed() {
		stopLookingForFingerprint();
		super.onBackPressed();
		}

		protected int getContentView() {
		if (mCanAssumeUdfps) {
		if (BiometricUtils.isReverseLandscape(getApplicationContext())) {
		@@ -130,6 +136,16 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		}
		}

		private void stopLookingForFingerprint() {
		if (mSidecar != null) {
		mSidecar.setListener(null);
		mSidecar.cancelEnrollment();
		getSupportFragmentManager()
		.beginTransaction().remove(mSidecar).commitAllowingStateLoss();
		mSidecar = null;
		}
		}

		private void startLookingForFingerprint() {
		mSidecar = (FingerprintEnrollSidecar) getSupportFragmentManager().findFragmentByTag(
		FingerprintEnrollEnrolling.TAG_SIDECAR);
		@@ -185,6 +201,7 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase implements
		}

		protected void onSkipButtonClick(View view) {
		stopLookingForFingerprint();
		setResult(RESULT_SKIP);
		finish();
		}