diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-12-16 00:21:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-16 00:21:29 +0000 |
| commit | 338dee9dd7a7b087bf182f16970c16ffd940b435 (patch) | |
| tree | 77d2745acb0680c4f90fd9a4a89485f99006559a /src/com/android/launcher3/Workspace.java | |
| parent | 99d814e54b28efc8c8d8d6dec4bb036a380c3c3f (diff) | |
| parent | 1cd01b023acc123b771765b7297d8aaedac224e0 (diff) | |
| download | android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.tar.gz android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.tar.bz2 android_packages_apps_Trebuchet-338dee9dd7a7b087bf182f16970c16ffd940b435.zip | |
Merge "Ensuring that ShortcutInfo always has an icon" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
| -rw-r--r-- | src/com/android/launcher3/Workspace.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index ee21b422e..ab9836757 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -170,7 +170,6 @@ public class Workspace extends PagedView private CellLayout mDropToLayout = null; @Thunk Launcher mLauncher; - @Thunk IconCache mIconCache; @Thunk DragController mDragController; // These are temporary variables to prevent having to allocate a new object just to @@ -514,9 +513,7 @@ public class Workspace extends PagedView */ protected void initWorkspace() { mCurrentPage = getDefaultPage(); - LauncherAppState app = LauncherAppState.getInstance(); DeviceProfile grid = mLauncher.getDeviceProfile(); - mIconCache = app.getIconCache(); setWillNotDraw(false); setClipChildren(false); setClipToPadding(false); @@ -3391,7 +3388,7 @@ public class Workspace extends PagedView break; case LauncherSettings.Favorites.ITEM_TYPE_FOLDER: view = FolderIcon.fromXml(R.layout.folder_icon, mLauncher, cellLayout, - (FolderInfo) info, mIconCache); + (FolderInfo) info); break; default: throw new IllegalStateException("Unknown item type: " + info.itemType); @@ -3999,8 +3996,7 @@ public class Workspace extends PagedView Drawable oldIcon = getTextViewIcon(shortcut); boolean oldPromiseState = (oldIcon instanceof PreloadIconDrawable) && ((PreloadIconDrawable) oldIcon).hasNotCompleted(); - shortcut.applyFromShortcutInfo(si, mIconCache, - si.isPromise() != oldPromiseState); + shortcut.applyFromShortcutInfo(si, si.isPromise() != oldPromiseState); } // process all the shortcuts return false; |