Merge "Make shortcuts on people row themed" into tm-qpr-dev am: 97baa50a07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21271707 Change-Id: Ibfcd0841a96442552b3851ed1324d9eac7ab2fb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user