Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bill Lin
2022-09-08 04:23:39 +00:00
committed by Android (Google) Code Review
parent a7aa18c159 9d546daf3c
commit 0aa37e3fad
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/biometrics/UdfpsEnrollProgressBarDrawable.java
View File

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