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

Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503

Change-Id: Ie7ca8f13d8f644ea03ff90a5c5a05f41f4536a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Joshua Mccloskey
2022-06-09 16:09:38 +00:00
committed by Automerger Merge Worker
parent 0295bc2285 6947d508e8
commit 71ca81a039
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
View File

@@ -508,7 +508,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
public void onEnrollmentProgressChange(int steps, int remaining) { public void onEnrollmentProgressChange(int steps, int remaining) {
updateProgress(true /* animate */); updateProgress(true /* animate */);
updateTitleAndDescription(); updateTitleAndDescription();
clearError();
animateFlash(); animateFlash();
if (!mCanAssumeUdfps) { if (!mCanAssumeUdfps) {
mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.removeCallbacks(mTouchAgainRunnable);
@@ -537,6 +536,11 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
int progress = getProgress( int progress = getProgress(
mSidecar.getEnrollmentSteps(), mSidecar.getEnrollmentRemaining()); mSidecar.getEnrollmentSteps(), mSidecar.getEnrollmentRemaining());
// Only clear the error when progress has been made.
// TODO (b/234772728) Add tests.
if (mProgressBar != null && mProgressBar.getProgress() < progress) {
clearError();
}
if (animate) { if (animate) {
animateProgress(progress); animateProgress(progress);
} else { } else {