Merge "PIN unlock buttons - contrast issue" into sc-dev am: 4bdb302f09

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

Change-Id: I03b21c206b38e86d7fc760c52c2126f263fd009d
This commit is contained in:
Matt Pietal
2021-07-16 01:51:17 +00:00
committed by Automerger Merge Worker

View File

@@ -88,13 +88,10 @@ public class NumPadButton extends AlphaOptimizedImageButton {
* Reload colors from resources. * Reload colors from resources.
**/ **/
public void reloadColors() { public void reloadColors() {
if (mAnimator != null) { if (mAnimator != null) mAnimator.reloadColors(getContext());
mAnimator.reloadColors(getContext());
} else { int textColor = Utils.getColorAttrDefaultColor(getContext(),
// Needed for old style pin android.R.attr.colorBackground);
int textColor = Utils.getColorAttr(getContext(), android.R.attr.textColorPrimary) ((VectorDrawable) getDrawable()).setTintList(ColorStateList.valueOf(textColor));
.getDefaultColor();
((VectorDrawable) getDrawable()).setTintList(ColorStateList.valueOf(textColor));
}
} }
} }