diff options
| author | Tony Wickham <twickham@google.com> | 2017-04-26 15:59:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-26 15:59:58 +0000 |
| commit | d4aac0a0289555c9125db4912fe7a893fdd61d64 (patch) | |
| tree | 9fd25c6cc37581bdd9871bf83f7dc81f628e9043 /src/com/android/launcher3/BubbleTextView.java | |
| parent | ca0cc050760a3c72d222466f0791f212a9cf4caa (diff) | |
| parent | 59c4ae4d89aefebe19c020742db9c37eb8b39798 (diff) | |
| download | android_packages_apps_Trebuchet-d4aac0a0289555c9125db4912fe7a893fdd61d64.tar.gz android_packages_apps_Trebuchet-d4aac0a0289555c9125db4912fe7a893fdd61d64.tar.bz2 android_packages_apps_Trebuchet-d4aac0a0289555c9125db4912fe7a893fdd61d64.zip | |
Merge "Move update popup header out of BubbleTextView" into ub-launcher3-dorval
am: 59c4ae4d89
Change-Id: I7d70478ccf17c74c65bab16641f888c105899799
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 45dabe9aa..689e4f474 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; @@ -586,18 +585,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. |