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

Commit 548bb0ac authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Automerger Merge Worker
Browse files

Merge "Fix UDFPS enroll when help received on first step" into sc-v2-dev am:... 

Merge "Fix UDFPS enroll when help received on first step" into sc-v2-dev am: 7f827a23 am: 457dce2c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16132289

Change-Id: I1cc2b3c6413978365733f5989743cc6f952939a5
parents b869a9b2 457dce2c

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarDrawable.java

+5 −8
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 


    @Nullable private UdfpsEnrollHelper mEnrollHelper;

    @NonNull private List<UdfpsEnrollProgressBarSegment> mSegments = new ArrayList<>();

    private int mTotalSteps = 1;

    private int mTotalSteps = 0;

    private int mProgressSteps = 0;

    private boolean mIsShowingHelp = false;
@@ -67,22 +67,19 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 


    void onEnrollmentProgress(int remaining, int totalSteps) {

        mTotalSteps = totalSteps;

        updateState(getProgressSteps(remaining, totalSteps), false /* isShowingHelp */);



        // Show some progress for the initial touch.

        updateState(Math.max(1, totalSteps - remaining), false /* isShowingHelp */);

    }



    void onEnrollmentHelp(int remaining, int totalSteps) {

        updateState(getProgressSteps(remaining, totalSteps), true /* isShowingHelp */);

        updateState(Math.max(0, totalSteps - remaining), true /* isShowingHelp */);

    }



    void onLastStepAcquired() {

        updateState(mTotalSteps, false /* isShowingHelp */);

    }



    private static int getProgressSteps(int remaining, int totalSteps) {

        // Show some progress for the initial touch.

        return Math.max(1, totalSteps - remaining);

    }



    private void updateState(int progressSteps, boolean isShowingHelp) {

        updateProgress(progressSteps);

        updateFillColor(isShowingHelp);