Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98819227 authored by Vincent Wang's avatar Vincent Wang Committed by Android (Google) Code Review
Browse files

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

parents 8ba47734 3ff1939b

res/layout/udfps_enroll_enrolling_v2.xml

+1 −1
Original line number Diff line number Diff line
@@ -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"

src/com/android/settings/biometrics2/ui/view/FingerprintEnrollEnrollingUdfpsFragment.java

+4 −3
Original line number Diff line number Diff line
@@ -261,9 +261,10 @@ public class FingerprintEnrollEnrollingUdfpsFragment extends Fragment { 


        final int progress = getProgress(enrollmentProgress);





        if (mProgressViewModel.getProgressLiveData().getValue().getSteps() != -1) {

            mUdfpsEnrollView.onEnrollmentProgress(enrollmentProgress.getRemaining(),

                    enrollmentProgress.getSteps());

        }



        if (animate) {

            animateProgress(progress);

src/com/android/settings/biometrics2/ui/widget/UdfpsEnrollProgressBarDrawable.java

+0 −2
Original line number Diff line number Diff line
@@ -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 */);

    }