diff options
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 637d95607..6ff46f85e 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -177,7 +177,7 @@ public final class Launcher extends Activity private AppWidgetManager mAppWidgetManager; private LauncherAppWidgetHost mAppWidgetHost; - private ItemInfo mPendingAddInfo = new ItemInfo("1"); + private ItemInfo mPendingAddInfo = new ItemInfo(); private int[] mTmpAddItemCellCoordinates = new int[2]; private FolderInfo mFolderInfo; @@ -946,7 +946,7 @@ public final class Launcher extends Activity } // Build Launcher-specific widget info and save to database - LauncherAppWidgetInfo launcherInfo = new LauncherAppWidgetInfo(appWidgetId, "2"); + LauncherAppWidgetInfo launcherInfo = new LauncherAppWidgetInfo(appWidgetId); launcherInfo.spanX = spanXY[0]; launcherInfo.spanY = spanXY[1]; @@ -1490,7 +1490,7 @@ public final class Launcher extends Activity FolderIcon addFolder(CellLayout layout, long container, final int screen, int cellX, int cellY) { - final FolderInfo folderInfo = new FolderInfo("3"); + final FolderInfo folderInfo = new FolderInfo(); folderInfo.title = getText(R.string.folder_name); // Update the model @@ -1602,7 +1602,9 @@ public final class Launcher extends Activity * leak the previous Home screen on orientation change. */ private void unbindWorkspaceAndHotseatItems() { - LauncherModel.unbindWorkspaceItems(); + if (mModel != null) { + mModel.unbindWorkspaceItems(); + } } /** @@ -2754,9 +2756,6 @@ public final class Launcher extends Activity if (mHotseat != null) { mHotseat.resetLayout(); } - - // This wasn't being called before which resulted in a leak of AppWidgetHostViews - unbindWorkspaceAndHotseatItems(); } /** |