From 3ff1939b5917876a2af480d471ee7d0781bca2e6 Mon Sep 17 00:00:00 2001 From: Vincent Wang Date: Thu, 2 Mar 2023 07:02:55 +0000 Subject: [PATCH] Fix Incorrect lottie status on the beginning of enrolling UDFPS Bug: b/271209610 Test: 1. adb root 2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true 3. Excute fingerprint enroll process & check the state of enroll progress is correct Change-Id: I3cac369e9dcf939a09dce11a7b9e96952bceeee8 --- res/layout/udfps_enroll_enrolling_v2.xml | 2 +- .../ui/view/FingerprintEnrollEnrollingUdfpsFragment.java | 7 ++++--- .../ui/widget/UdfpsEnrollProgressBarDrawable.java | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/res/layout/udfps_enroll_enrolling_v2.xml b/res/layout/udfps_enroll_enrolling_v2.xml index 96298f91d0b..4675606592d 100644 --- a/res/layout/udfps_enroll_enrolling_v2.xml +++ b/res/layout/udfps_enroll_enrolling_v2.xml @@ -61,7 +61,7 @@ android:layout_height="200dp" android:layout_alignParentTop="true" android:layout_alignParentStart="true" - android:layout_marginTop="294dp" + android:layout_marginTop="206dp" android:layout_marginStart="16dp" android:layout_marginEnd="17dp" android:scaleType="centerInside" diff --git a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java index 60fe8f47797..0fdfd2ee63e 100644 --- a/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java +++ b/src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java @@ -261,9 +261,10 @@ public class FingerprintEnrollEnrollingUdfpsFragment extends Fragment { final int progress = getProgress(enrollmentProgress); - - mUdfpsEnrollView.onEnrollmentProgress(enrollmentProgress.getRemaining(), - enrollmentProgress.getSteps()); + if (mProgressViewModel.getProgressLiveData().getValue().getSteps() != -1) { + mUdfpsEnrollView.onEnrollmentProgress(enrollmentProgress.getRemaining(), + enrollmentProgress.getSteps()); + } if (animate) { animateProgress(progress); diff --git a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java index 3f8388fcb5e..8cb4bb26b64 100644 --- a/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java +++ b/src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java @@ -180,8 +180,6 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { } void onEnrollmentProgress(final int remaining, final int totalSteps) { - android.util.Log.e(TAG, "remaining =" + remaining); - android.util.Log.e(TAG, "totalSteps =" + totalSteps); mAfterFirstTouch = true; updateState(remaining, totalSteps, false /* showingHelp */); }