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

Merge "Apply tints when setting dial/hands to icons" into sc-dev

Browse Source
This commit is contained in:
Stevie Kideckel
2021-04-09 21:28:08 +00:00
committed by Android (Google) Code Review
parent 6ced9cfac2 c134d8fac3
commit d9becf72da
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/AnalogClock.java
View File

@@ -212,6 +212,9 @@ public class AnalogClock extends View {
mDial = icon.loadDrawable(getContext()); mDial = icon.loadDrawable(getContext());
mDialWidth = mDial.getIntrinsicWidth(); mDialWidth = mDial.getIntrinsicWidth();
mDialHeight = mDial.getIntrinsicHeight(); mDialHeight = mDial.getIntrinsicHeight();
if (mDialTintInfo.mHasTintList || mDialTintInfo.mHasTintBlendMode) {
mDial = mDialTintInfo.apply(mDial);
}
mChanged = true; mChanged = true;
invalidate(); invalidate();
@@ -283,6 +286,9 @@ public class AnalogClock extends View {
@RemotableViewMethod @RemotableViewMethod
public void setHourHand(@NonNull Icon icon) { public void setHourHand(@NonNull Icon icon) {
mHourHand = icon.loadDrawable(getContext()); mHourHand = icon.loadDrawable(getContext());
if (mHourHandTintInfo.mHasTintList || mHourHandTintInfo.mHasTintBlendMode) {
mHourHand = mHourHandTintInfo.apply(mHourHand);
}
mChanged = true; mChanged = true;
invalidate(); invalidate();
@@ -357,6 +363,9 @@ public class AnalogClock extends View {
@RemotableViewMethod @RemotableViewMethod
public void setMinuteHand(@NonNull Icon icon) { public void setMinuteHand(@NonNull Icon icon) {
mMinuteHand = icon.loadDrawable(getContext()); mMinuteHand = icon.loadDrawable(getContext());
if (mMinuteHandTintInfo.mHasTintList || mMinuteHandTintInfo.mHasTintBlendMode) {
mMinuteHand = mMinuteHandTintInfo.apply(mMinuteHand);
}
mChanged = true; mChanged = true;
invalidate(); invalidate();
@@ -434,6 +443,9 @@ public class AnalogClock extends View {
@RemotableViewMethod @RemotableViewMethod
public void setSecondHand(@Nullable Icon icon) { public void setSecondHand(@Nullable Icon icon) {
mSecondHand = icon == null ? null : icon.loadDrawable(getContext()); mSecondHand = icon == null ? null : icon.loadDrawable(getContext());
if (mSecondHandTintInfo.mHasTintList || mSecondHandTintInfo.mHasTintBlendMode) {
mSecondHand = mSecondHandTintInfo.apply(mSecondHand);
}
mSecondsTick.run(); mSecondsTick.run();
mChanged = true; mChanged = true;