Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev

2015-05-27 18:33:25 +00:00
parent fc05d80102 bc68ba22f1
commit fd5ec09fe2
1 changed files with 4 additions and 0 deletions
--- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
@@ -139,6 +139,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
        super.onStop();
        mSidecar.setListener(null);
        stopIconAnimation();
+        if (!isChangingConfigurations()) {
+            finish();
+        }
    }

    private void animateProgress(int progress) {
@@ -184,6 +187,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
    @Override
    public void onEnrollmentError(CharSequence errString) {
        mErrorText.setText(errString);
+        stopIconAnimation();
    }

    @Override