diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-02 23:19:37 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-02 23:19:37 +0000 |
commit | 7082346df877569dfa7e8c36f839e0b6bdd5f2c0 (patch) | |
tree | f10e837e6886fcd6402c082c296bf68a30cfec27 | |
parent | 240bcc4e6db63dd571876e7ad78eb328439dcdff (diff) | |
parent | 8cc9b842a8451b11c37caa26443a4c34e324ecd5 (diff) | |
download | systemui-7082346df877569dfa7e8c36f839e0b6bdd5f2c0.tar.gz |
Snap for 8676880 from 8cc9b842a8451b11c37caa26443a4c34e324ecd5 to tm-d1-releaseandroid-13.0.0_r9android-13.0.0_r15android-13.0.0_r14android-13.0.0_r13android-13.0.0_r11android-13.0.0_r10android13-d1-s3-releaseandroid13-d1-s2-releaseandroid13-d1-s1-releaseandroid13-d1-release
Change-Id: I6ff5995cb965e57c768a4643317cfb209c416487
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java index 176846f..d624805 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java +++ b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java @@ -389,6 +389,10 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap mFullDrawable = (AdaptiveIconDrawable) mAnimInfo.baseDrawableState.newDrawable(); mFG = (LayerDrawable) mFullDrawable.getForeground(); + + // Time needs to be applied here since drawInternal is NOT guaranteed to be called + // before this foreground drawable is shown on the screen. + mAnimInfo.applyTime(mTime, mFG); mCanvasScale = 1 - 2 * mBoundsOffset; } @@ -422,18 +426,6 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap } @Override - public boolean setState(int[] stateSet) { - // If the user has just pressed the clock icon, and the clock app is launching, - // we don't want to change the time shown. Doing so can result in jank. - for (int state: stateSet) { - if (state == android.R.attr.state_pressed) { - return false; - } - } - return super.setState(stateSet); - } - - @Override public boolean isThemed() { return mBgPaint.getColorFilter() != null; } |