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

Commit 9d546daf authored by Bill Lin's avatar Bill Lin
Browse files

Revert "Fix the 1st udfps#enroll#error always fill red color" 

This reverts commit 84b498d4.

Reason for revert: Introduce regression b/243906317

Change-Id: I88c5da6e4b6e0f05e250b185ac5d754eac911330
parent 84b498d4

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

+3 −4
Original line number Original line Diff line number Diff line
@@ -99,11 +99,12 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
        mProgressColor = context.getColor(R.color.udfps_enroll_progress);

        mProgressColor = context.getColor(R.color.udfps_enroll_progress);

        final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);

        final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);

        mIsAccessibilityEnabled = am.isTouchExplorationEnabled();

        mIsAccessibilityEnabled = am.isTouchExplorationEnabled();

        mOnFirstBucketFailedColor = context.getColor(R.color.udfps_moving_target_fill_error);

        if (!mIsAccessibilityEnabled) {

        if (!mIsAccessibilityEnabled) {

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help);

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help);

            mOnFirstBucketFailedColor = context.getColor(R.color.udfps_moving_target_fill_error);

        } else {

        } else {

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help_with_talkback);

            mHelpColor = context.getColor(R.color.udfps_enroll_progress_help_with_talkback);

            mOnFirstBucketFailedColor = mHelpColor;

        }

        }

        mCheckmarkDrawable = context.getDrawable(R.drawable.udfps_enroll_checkmark);

        mCheckmarkDrawable = context.getDrawable(R.drawable.udfps_enroll_checkmark);

        mCheckmarkDrawable.mutate();

        mCheckmarkDrawable.mutate();
@@ -166,8 +167,7 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
    }

    }





    private void updateProgress(int remainingSteps, int totalSteps, boolean showingHelp) {

    private void updateProgress(int remainingSteps, int totalSteps, boolean showingHelp) {

        if (mRemainingSteps == remainingSteps && mTotalSteps == totalSteps

        if (mRemainingSteps == remainingSteps && mTotalSteps == totalSteps) {

                && mShowingHelp == showingHelp) {

            return;

            return;

        }

        }
@@ -197,7 +197,6 @@ public class UdfpsEnrollProgressBarDrawable extends Drawable { 
            }

            }

        }

        }





        mShowingHelp = showingHelp;

        mRemainingSteps = remainingSteps;

        mRemainingSteps = remainingSteps;

        mTotalSteps = totalSteps;

        mTotalSteps = totalSteps;