diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-02-28 14:18:54 -0800 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-02-28 17:52:42 -0800 |
| commit | 529af302dc2141f6e5e4eabbe981c228a9a0df2c (patch) | |
| tree | be0f433ba4606d2c7e89956694f0773f46bd2fa3 /src/com/android/launcher3/BubbleTextView.java | |
| parent | d8745db015aff616d25359ec3bf542174aca9de2 (diff) | |
| download | android_packages_apps_Trebuchet-529af302dc2141f6e5e4eabbe981c228a9a0df2c.tar.gz android_packages_apps_Trebuchet-529af302dc2141f6e5e4eabbe981c228a9a0df2c.tar.bz2 android_packages_apps_Trebuchet-529af302dc2141f6e5e4eabbe981c228a9a0df2c.zip | |
Use FolderIconPreviewVerifier to check if item is in preview.
Bug: 35064148
Bug: 33600656
Change-Id: I71a03636276e6169c7eb8c68eecf31f37fde2d56
Diffstat (limited to 'src/com/android/launcher3/BubbleTextView.java')
| -rw-r--r-- | src/com/android/launcher3/BubbleTextView.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index 107d7006a..af64b8789 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -40,6 +40,7 @@ import com.android.launcher3.IconCache.ItemInfoUpdateReceiver; import com.android.launcher3.badge.BadgeInfo; import com.android.launcher3.badge.BadgeRenderer; import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.folder.FolderIconPreviewVerifier; import com.android.launcher3.graphics.DrawableFactory; import com.android.launcher3.graphics.HolographicOutlineHelper; import com.android.launcher3.graphics.IconPalette; @@ -548,7 +549,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver { applyFromApplicationInfo((AppInfo) info); } else if (info instanceof ShortcutInfo) { applyFromShortcutInfo((ShortcutInfo) info); - if ((info.rank < FolderIcon.NUM_ITEMS_IN_PREVIEW) && (info.container >= 0)) { + FolderIconPreviewVerifier verifier = + new FolderIconPreviewVerifier(mLauncher.getDeviceProfile().inv); + if (verifier.isItemInPreview(info.rank) && (info.container >= 0)) { View folderIcon = mLauncher.getWorkspace().getHomescreenIconByItemId(info.container); if (folderIcon != null) { |