| commit | c96d6c75504b6d85fec60a9b26e3b2220e090b3b | [log] [tgz] |
|---|---|---|
| author | Sunny Goyal <sunnygoyal@google.com> | Wed Aug 04 17:00:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 04 17:00:28 2021 +0000 |
| tree | 585d5a464eb15bd8a2a2d2503ea7437cba516a3f | |
| parent | 9bb59427bfd39e09c4cb4191e14587cee3f2a952 [diff] | |
| parent | fcbe069feeaa39ad66e92a3c544d5dd2942cbb5b [diff] |
Merge "Using themed icons in taskbar" into sc-v2-dev am: a67358bc8d am: fcbe069fee Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15456194 Change-Id: I724840feed8f01e0f961c819795b555c8cb8985b
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index f800cf6..02fe7d9 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java
@@ -321,7 +321,8 @@ @UiThread protected void applyIconAndLabel(ItemInfoWithIcon info) { - boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER; + boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER + || mDisplay == DISPLAY_TASKBAR; FastBitmapDrawable iconDrawable = info.newIcon(getContext(), useTheme); mDotParams.color = IconPalette.getMutedColor(iconDrawable.getIconColor(), 0.54f);