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

Merge "Fix Incorrect lottie status on the beginning of enrolling UDFPS" into udc-dev am: 98819227f1

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

Change-Id: I303f5583775ddb7fa038c4b8e6ae339090f4929c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vincent Wang
2023-03-02 13:28:37 +00:00
committed by Automerger Merge Worker
parent b5c70634b4 98819227f1
commit baa851a640
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/udfps_enroll_enrolling_v2.xml
View File

@@ -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"

7
src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java
View File

@@ -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);

2
src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java
View File

@@ -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 */);
}