Merge "Fix issues with SUW on fingerprint devices" (5e25500b) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,8 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase

		@Override
		protected void onStop() {
		super.onStop();

		if (mSidecar != null) {
		mSidecar.setListener(null);
		}
		@@ -77,6 +79,12 @@ public abstract class BiometricsEnrollEnrolling extends BiometricEnrollBase
		}
		}

		@Override
		protected boolean shouldFinishWhenBackgrounded() {
		// Prevent super.onStop() from finishing, since we handle this in our onStop().
		return false;
		}

		@Override
		public void onBackPressed() {
		if (mSidecar != null) {

+4 −2

Original line number	Diff line number	Diff line
		@@ -217,13 +217,15 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {

		private void stopIconAnimation() {
		mAnimationCancelled = true;
		if (mIconAnimationDrawable != null) {
		mIconAnimationDrawable.stop();
		}
		}

		@Override
		protected void onStop() {
		stopIconAnimation();
		super.onStop();
		stopIconAnimation();
		}

		private void animateProgress(int progress) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,10 +115,10 @@ public class FingerprintEnrollFindSensor extends BiometricEnrollBase {

		@Override
		protected void onStop() {
		super.onStop();
		if (mAnimation != null) {
		mAnimation.pauseAnimation();
		}
		super.onStop();
		}

		@Override