diff options
author | Stefan Andonian <andonian@google.com> | 2022-04-07 18:35:13 +0000 |
---|---|---|
committer | Stefan Andonian <andonian@google.com> | 2022-04-19 22:08:19 +0000 |
commit | 81f8cb36247bb0a3885008981e93fba68ba2117a (patch) | |
tree | 056b53d63f5c3c24e252f58eec0c2added02592e | |
parent | 598b692786e6e1b80f1a1bc4a9bcd014be73bcf7 (diff) | |
download | systemui-81f8cb36247bb0a3885008981e93fba68ba2117a.tar.gz |
Implement Focus Mode UX for the Clock icon.
Bug: 223981931
Test: Verified that the clock icon drawable looks correct in all
combinations of dark, light, themed, and focus UX modes.
Change-Id: I2506b9322cd5d0590d1ee58715e6d69aff22d382
-rw-r--r-- | iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java index c2a7b33..ef1bc3e 100644 --- a/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java +++ b/iconloaderlib/src/com/android/launcher3/icons/ClockDrawableWrapper.java @@ -60,6 +60,7 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap private static final boolean DISABLE_SECONDS = true; private static final int NO_COLOR = -1; + private static final int FULLY_OPAQUE = 255; // Time after which the clock icon should check for an update. The actual invalidate // will only happen in case of any change. @@ -370,6 +371,7 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap private final Bitmap mBG; private final Paint mBgPaint = new Paint(Paint.FILTER_BITMAP_FLAG | Paint.ANTI_ALIAS_FLAG); + private final ColorFilter mBgFilter; private final int mThemedFgColor; private final AdaptiveIconDrawable mFullDrawable; @@ -382,6 +384,7 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap mAnimInfo = cs.mAnimInfo; mBG = cs.mBG; + mBgFilter = cs.mBgFilter; mBgPaint.setColorFilter(cs.mBgFilter); mThemedFgColor = cs.mThemedFgColor; @@ -427,7 +430,11 @@ public class ClockDrawableWrapper extends AdaptiveIconDrawable implements Bitmap @Override protected void updateFilter() { super.updateFilter(); - mFullDrawable.setColorFilter(mPaint.getColorFilter()); + int alpha = mIsDisabled ? (int) (mDisabledAlpha * FULLY_OPAQUE) : FULLY_OPAQUE; + mBgPaint.setAlpha(alpha); + mFG.setAlpha(alpha); + mBgPaint.setColorFilter(mIsDisabled ? getDisabledColorFilter() : mBgFilter); + mFG.setColorFilter(mIsDisabled ? getDisabledColorFilter() : null); } @Override |