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

Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev

Browse Source 
am: efc87af3f8

* commit 'efc87af3f817921c187ef0be7c0860e71f7ce7ea':
  Fixes autoadvance on find sensor page for fingerprint.
This commit is contained in:
Udam Saini
2016-02-17 01:33:50 +00:00
committed by android-build-merger
parent 7c8c873b07 efc87af3f8
commit 7e7672184a
1 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,15 +168,30 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
mSidecar.setListener(null); if (mSidecar != null) {
mSidecar.setListener(null);
}
stopIconAnimation(); stopIconAnimation();
if (!isChangingConfigurations()) { if (!isChangingConfigurations()) {
mSidecar.cancelEnrollment(); if (mSidecar != null) {
getFragmentManager().beginTransaction().remove(mSidecar).commit(); mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commit();
}
finish(); finish();
} }
} }
@Override
public void onBackPressed() {
if (mSidecar != null) {
mSidecar.setListener(null);
mSidecar.cancelEnrollment();
getFragmentManager().beginTransaction().remove(mSidecar).commit();
mSidecar = null;
}
super.onBackPressed();
}
private void animateProgress(int progress) { private void animateProgress(int progress) {
if (mProgressAnim != null) { if (mProgressAnim != null) {
mProgressAnim.cancel(); mProgressAnim.cancel();