commit f5a2a7edb9c139ef582314e95b097cae89c0da66
author Jim Miller <jaggies@google.com> Thu Nov 19 22:05:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 19 22:05:08 2015 +0000
tree 1aae478755d60caefe7dbdc6d8a37ed00c991509
parent a180abf6cf4d6d37091083b0c826bfad60ce61f8
parent c5e286570bb002af1d2870eae33dda09fff805ec

Merge "Revert "Auto advance fingerprint enrollment when user taps on the sensor""

src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
index b00f98e..fe0bb63 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -50,7 +50,7 @@
 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;

src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 8122d02..63d9335 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -23,12 +23,11 @@
 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 @@
 
     private FingerprintLocationAnimationView mAnimation;
     private boolean mLaunchedConfirmLock;
-    private FingerprintEnrollSidecar mSidecar;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -56,14 +54,6 @@
     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 @@
     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();
-    }
 }