commit 529af302dc2141f6e5e4eabbe981c228a9a0df2c
author Jon Miranda <jonmiranda@google.com> Tue Feb 28 14:18:54 2017 -0800
committer Jon Miranda <jonmiranda@google.com> Tue Feb 28 17:52:42 2017 -0800
tree be0f433ba4606d2c7e89956694f0773f46bd2fa3
parent d8745db015aff616d25359ec3bf542174aca9de2

Use FolderIconPreviewVerifier to check if item is in preview.

Bug: 35064148
Bug: 33600656
Change-Id: I71a03636276e6169c7eb8c68eecf31f37fde2d56

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 845fdbf..e7a8783 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -884,6 +884,8 @@
                     Intent intent;
                     String targetPkg;
 
+                    FolderIconPreviewVerifier verifier =
+                            new FolderIconPreviewVerifier(mApp.getInvariantDeviceProfile());
                     while (!mStopped && c.moveToNext()) {
                         try {
                             if (c.user == null) {
@@ -1008,7 +1010,7 @@
                                 }
 
                                 boolean useLowResIcon = !c.isOnWorkspaceOrHotseat() &&
-                                        c.getInt(rankIndex) >= FolderIcon.NUM_ITEMS_IN_PREVIEW;
+                                        !verifier.isItemInPreview(c.getInt(rankIndex));
 
                                 if (c.restoreFlag != 0) {
                                     // Already verified above that user is same as default user