diff options
| author | Winson Chung <winsonc@google.com> | 2013-10-03 18:34:14 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2013-10-03 18:46:06 -0700 |
| commit | 8741298d3c6a17015dabc4aacc261fd8eb59992d (patch) | |
| tree | 166be765b294e009be718c607a1720768c25b744 | |
| parent | ed60ba1e24512bef0bb2b749b6297e8c7e5330cf (diff) | |
| download | android_packages_apps_Trebuchet-8741298d3c6a17015dabc4aacc261fd8eb59992d.tar.gz android_packages_apps_Trebuchet-8741298d3c6a17015dabc4aacc261fd8eb59992d.tar.bz2 android_packages_apps_Trebuchet-8741298d3c6a17015dabc4aacc261fd8eb59992d.zip | |
Fixing issue with numerous empty screens showing when adding a shortcut to a clear workspace. (Bug 10785413)
Change-Id: Ib9b5f76dc23e609b1774147a6cf760f185d9154b
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 | ||||
| -rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f3a02b3c2..e3e065e03 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3664,6 +3664,9 @@ public class Launcher extends Activity addAnimated.size(), true); } + // Remove the extra empty screen + mWorkspace.removeExtraEmptyScreen(); + if (!AppsCustomizePagedView.DISABLE_ALL_APPS && addedApps != null && mAppsCustomizeContent != null) { mAppsCustomizeContent.addApps(addedApps); diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index edfc07059..d1819e14d 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -318,8 +318,10 @@ public class LauncherModel extends BroadcastReceiver { continue; } - // Add this icon to the db, creating a new page if necessary - int startSearchPageIndex = 1; + // Add this icon to the db, creating a new page if necessary. If there + // is only the empty page then we just add items to the first page. + // Otherwise, we add them to the next pages. + int startSearchPageIndex = workspaceScreens.isEmpty() ? 0 : 1; Pair<Long, int[]> coords = LauncherModel.findNextAvailableIconSpace(context, name, launchIntent, startSearchPageIndex, workspaceScreens); if (coords == null) { |