diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-02 19:09:49 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-02 19:09:49 +0000 |
commit | d72e8e8fba7409f43297962cff35336f3eec4b1f (patch) | |
tree | f10e837e6886fcd6402c082c296bf68a30cfec27 | |
parent | 1dc24e51ff4623a623f99af3f5b383cb599139cc (diff) | |
parent | 2e94da8396e178b2a52a1381c67d4c3921a85c5e (diff) | |
download | systemui-aml_swc_331116000.tar.gz |
Snap for 8675895 from 2e94da8396e178b2a52a1381c67d4c3921a85c5e to mainline-media-swcodec-releaseaml_swc_331911000aml_swc_331712000aml_swc_331612000aml_swc_331511000aml_swc_331410000aml_swc_331318000aml_swc_331116000aml_swc_331012020android13-mainline-media-swcodec-release
Change-Id: I3fc26794091ae454312508bf8cf230ba51a4f617
-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; } |