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

Commit 4c997ba0 authored by Stevie Kideckel's avatar Stevie Kideckel Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ib44527826235a96ab77309f2d4d46bb6335256bd
parents 45985249 d9becf72

core/java/android/widget/AnalogClock.java

+12 −0
Original line number Diff line number Diff line
@@ -212,6 +212,9 @@ public class AnalogClock extends View { 
        mDial = icon.loadDrawable(getContext());

        mDialWidth = mDial.getIntrinsicWidth();

        mDialHeight = mDial.getIntrinsicHeight();

        if (mDialTintInfo.mHasTintList || mDialTintInfo.mHasTintBlendMode) {

            mDial = mDialTintInfo.apply(mDial);

        }



        mChanged = true;

        invalidate();
@@ -283,6 +286,9 @@ public class AnalogClock extends View { 
    @RemotableViewMethod

    public void setHourHand(@NonNull Icon icon) {

        mHourHand = icon.loadDrawable(getContext());

        if (mHourHandTintInfo.mHasTintList || mHourHandTintInfo.mHasTintBlendMode) {

            mHourHand = mHourHandTintInfo.apply(mHourHand);

        }



        mChanged = true;

        invalidate();
@@ -357,6 +363,9 @@ public class AnalogClock extends View { 
    @RemotableViewMethod

    public void setMinuteHand(@NonNull Icon icon) {

        mMinuteHand = icon.loadDrawable(getContext());

        if (mMinuteHandTintInfo.mHasTintList || mMinuteHandTintInfo.mHasTintBlendMode) {

            mMinuteHand = mMinuteHandTintInfo.apply(mMinuteHand);

        }



        mChanged = true;

        invalidate();
@@ -434,6 +443,9 @@ public class AnalogClock extends View { 
    @RemotableViewMethod

    public void setSecondHand(@Nullable Icon icon) {

        mSecondHand = icon == null ? null : icon.loadDrawable(getContext());

        if (mSecondHandTintInfo.mHasTintList || mSecondHandTintInfo.mHasTintBlendMode) {

            mSecondHand = mSecondHandTintInfo.apply(mSecondHand);

        }

        mSecondsTick.run();



        mChanged = true;