Merge "Fixes autoadvance on find sensor page for fingerprint." into nyc-dev (efc87af3) · Commits · e / os / android_packages_apps_Settings

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

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -168,15 +168,30 @@ public class FingerprintEnrollEnrolling extends FingerprintEnrollBase
	@Override		@Override
	protected void onStop() {		protected void onStop() {
	super.onStop();		super.onStop();
			if (mSidecar != null) {
	mSidecar.setListener(null);		mSidecar.setListener(null);
			}
	stopIconAnimation();		stopIconAnimation();
	if (!isChangingConfigurations()) {		if (!isChangingConfigurations()) {
			if (mSidecar != null) {
	mSidecar.cancelEnrollment();		mSidecar.cancelEnrollment();
	getFragmentManager().beginTransaction().remove(mSidecar).commit();		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();