diff options
| author | Tony Wickham <twickham@google.com> | 2017-06-08 15:49:07 -0700 |
|---|---|---|
| committer | Tony Wickham <twickham@google.com> | 2017-06-08 15:49:07 -0700 |
| commit | 0ecf5bcfcb329728231c2289f0ade8a0830860a9 (patch) | |
| tree | da17e72745e9cea493266ea5ee709b37387b9386 /src/com/android/launcher3/popup | |
| parent | 6d55202c9bf4e7181cf5a34772a070d4941b6de0 (diff) | |
| parent | 7092db02410562026da17a7b38f48025cc847de2 (diff) | |
| download | android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.tar.gz android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.tar.bz2 android_packages_apps_Trebuchet-0ecf5bcfcb329728231c2289f0ade8a0830860a9.zip | |
resolve merge conflicts of 7092db024 to ub-launcher3-dorval-polish
Test: I solemnly swear I tested this conflict resolution.x
Change-Id: I0f9ed3d42fcb04299c3c23d06629f855614c0538
Diffstat (limited to 'src/com/android/launcher3/popup')
| -rw-r--r-- | src/com/android/launcher3/popup/PopupContainerWithArrow.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/launcher3/popup/PopupContainerWithArrow.java b/src/com/android/launcher3/popup/PopupContainerWithArrow.java index 131abbad9..5463ef772 100644 --- a/src/com/android/launcher3/popup/PopupContainerWithArrow.java +++ b/src/com/android/launcher3/popup/PopupContainerWithArrow.java @@ -49,7 +49,6 @@ import com.android.launcher3.AbstractFloatingView; import com.android.launcher3.BubbleTextView; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget; -import com.android.launcher3.FastBitmapDrawable; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherAnimUtils; @@ -628,9 +627,7 @@ public class PopupContainerWithArrow extends AbstractFloatingView implements Dra ItemInfo itemInfo = (ItemInfo) mOriginalIcon.getTag(); BadgeInfo badgeInfo = mLauncher.getPopupDataProvider().getBadgeInfoForItem(itemInfo); if (mNotificationItemView != null && badgeInfo != null) { - IconPalette palette = mOriginalIcon.getIcon() instanceof FastBitmapDrawable - ? ((FastBitmapDrawable) mOriginalIcon.getIcon()).getIconPalette() - : null; + IconPalette palette = mOriginalIcon.getBadgePalette(); mNotificationItemView.updateHeader(badgeInfo.getNotificationCount(), palette); } } |