PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jorim Jaggi
2015-05-27 18:33:25 +00:00
committed by Android (Google) Code Review
parent fc05d80102 bc68ba22f1
commit fd5ec09fe2
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -139,6 +139,9 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
super.onStop(); super.onStop();
mSidecar.setListener(null); mSidecar.setListener(null);
stopIconAnimation(); stopIconAnimation();
if (!isChangingConfigurations()) {
finish();
}
} }
private void animateProgress(int progress) { private void animateProgress(int progress) {
@@ -184,6 +187,7 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
@Override @Override
public void onEnrollmentError(CharSequence errString) { public void onEnrollmentError(CharSequence errString) {
mErrorText.setText(errString); mErrorText.setText(errString);
stopIconAnimation();
} }
@Override @Override