From 2fe09f24eb4aec723dddcfac87e2e801eaa015e6 Mon Sep 17 00:00:00 2001 From: Tony Wickham Date: Tue, 25 Apr 2017 12:46:04 -0700 Subject: Move update popup header out of BubbleTextView Now we update from Launcher, which is both more efficient (only run it when badges update, not whenever BubbleTextView applies an ItemInfo) and more logical/cleaner. Change-Id: Ib77433d9489c29e9781b3a48de37de0e07b5ba07 --- src/com/android/launcher3/BubbleTextView.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/com/android/launcher3/BubbleTextView.java') diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 97e93a008..24d16d7e5 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -49,7 +49,6 @@ import com.android.launcher3.graphics.HolographicOutlineHelper; import com.android.launcher3.graphics.IconPalette; import com.android.launcher3.graphics.PreloadIconDrawable; import com.android.launcher3.model.PackageItemInfo; -import com.android.launcher3.popup.PopupContainerWithArrow; import java.text.NumberFormat; @@ -573,18 +572,11 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { public void applyBadgeState(ItemInfo itemInfo, boolean animate) { if (mIcon instanceof FastBitmapDrawable) { - BadgeInfo badgeInfo = mLauncher.getPopupDataProvider().getBadgeInfoForItem(itemInfo); - BadgeRenderer badgeRenderer = mLauncher.getDeviceProfile().mBadgeRenderer; - PopupContainerWithArrow popup = PopupContainerWithArrow.getOpen(mLauncher); - if (popup != null) { - popup.updateNotificationHeader(badgeInfo, itemInfo); - } - boolean wasBadged = mBadgeInfo != null; - boolean isBadged = badgeInfo != null; + mBadgeInfo = mLauncher.getPopupDataProvider().getBadgeInfoForItem(itemInfo); + boolean isBadged = mBadgeInfo != null; float newBadgeScale = isBadged ? 1f : 0; - mBadgeInfo = badgeInfo; - mBadgeRenderer = badgeRenderer; + mBadgeRenderer = mLauncher.getDeviceProfile().mBadgeRenderer; if (wasBadged || isBadged) { mIconPalette = ((FastBitmapDrawable) mIcon).getIconPalette(); // Animate when a badge is first added or when it is removed. -- cgit v1.2.3