Merge "Revert "Fix the 1st udfps#enroll#error always fill red color"" into tm-qpr-dev (0aa37e3f) · Commits · e / os / android_frameworks_base

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;