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

Commit a7ee8e6c authored by Bill Lin's avatar Bill Lin Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Fix the 1st udfps#enroll#error always fill red color"" into tm-qpr-dev am: 0aa37e3f

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



Change-Id: I21fb88f8e4a31782384afa002ff0ace285643a4f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd1265b4 0aa37e3f

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

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

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

        mIsAccessibilityEnabled = am.isTouchExplorationEnabled();

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

        if (!mIsAccessibilityEnabled) {

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

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

        } else {

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

            mOnFirstBucketFailedColor = mHelpColor;

        }

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

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



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

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

                && mShowingHelp == showingHelp) {

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

            return;

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

        }



        mShowingHelp = showingHelp;

        mRemainingSteps = remainingSteps;

        mTotalSteps = totalSteps;