Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07 am: 2cdd533c77

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707

Change-Id: I70c1e758cec25e5cec513082e6277e23fd50487f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2023-02-22 03:50:10 +00:00
committed by Automerger Merge Worker
@@ -374,9 +374,7 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
@UiThread
protected void applyIconAndLabel(ItemInfoWithIcon info) {
boolean useTheme = mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER
|| mDisplay == DISPLAY_TASKBAR;
int flags = useTheme ? FLAG_THEMED : 0;
int flags = shouldUseTheme() ? FLAG_THEMED : 0;
if (mHideBadge) {
flags |= FLAG_NO_BADGE;
}
@@ -388,6 +386,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
applyLabel(info);
}
protected boolean shouldUseTheme() {
return mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER
|| mDisplay == DISPLAY_TASKBAR;
}
@UiThread
private void applyLabel(ItemInfoWithIcon info) {
setText(info.title);