From c5e286570bb002af1d2870eae33dda09fff805ec Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Thu, 19 Nov 2015 22:02:11 +0000 Subject: [PATCH] Revert "Auto advance fingerprint enrollment when user taps on the sensor" This reverts commit b3253f1d75cffe24cb92bc40942f05be70bbb564. Fixes bug 25694018 Change-Id: I29c78e6669db79ff996a1ecdf1cf45cff9ecef69 --- .../FingerprintEnrollEnrolling.java | 2 +- .../FingerprintEnrollFindSensor.java | 28 +------------------ 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index b00f98ee43b..fe0bb63fd07 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -50,7 +50,7 @@ import com.android.settings.R; public class FingerprintEnrollEnrolling extends FingerprintEnrollBase implements FingerprintEnrollSidecar.Listener { - static final String TAG_SIDECAR = "sidecar"; + private static final String TAG_SIDECAR = "sidecar"; private static final int PROGRESS_BAR_MAX = 10000; private static final int FINISH_DELAY = 250; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index 8122d02b39e..63d93354ee8 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -23,12 +23,11 @@ import android.os.Bundle; import com.android.internal.logging.MetricsLogger; import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.R; -import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener; /** * Activity explaining the fingerprint sensor location for fingerprint enrollment. */ -public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implements Listener { +public class FingerprintEnrollFindSensor extends FingerprintEnrollBase { private static final int CONFIRM_REQUEST = 1; private static final int ENROLLING = 2; @@ -36,7 +35,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement private FingerprintLocationAnimationView mAnimation; private boolean mLaunchedConfirmLock; - private FingerprintEnrollSidecar mSidecar; @Override protected void onCreate(Bundle savedInstanceState) { @@ -56,14 +54,6 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement protected void onStart() { super.onStart(); mAnimation.startAnimation(); - mSidecar = (FingerprintEnrollSidecar) getFragmentManager().findFragmentByTag( - FingerprintEnrollEnrolling.TAG_SIDECAR); - if (mSidecar == null) { - mSidecar = new FingerprintEnrollSidecar(); - getFragmentManager().beginTransaction() - .add(mSidecar, FingerprintEnrollEnrolling.TAG_SIDECAR).commit(); - } - mSidecar.setListener(this); } @Override @@ -135,20 +125,4 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase implement protected int getMetricsCategory() { return MetricsLogger.FINGERPRINT_FIND_SENSOR; } - - @Override - public void onEnrollmentHelp(CharSequence helpString) { - } - - @Override - public void onEnrollmentError(int errMsgId, CharSequence errString) { - } - - @Override - public void onEnrollmentProgressChange(int steps, int remaining) { - // Activity on the sensor should auto-advance to the enrolling step - mSidecar.setListener(null); - getFragmentManager().beginTransaction().remove(mSidecar).commit(); - onNextButtonClick(); - } }