summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Launcher.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-09-13 23:05:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-13 23:05:03 +0000
commit0a1cc7da274dcf343b4fdc9c336d1f574b3f2133 (patch)
tree852e730304becb1cdd76d5a63924f29f9b5867d6 /src/com/android/launcher3/Launcher.java
parent468a1556009006c7a111b5de583f0c5c71792312 (diff)
parent5084cbab0eb0c06bd2778e0a48efaf392717cd10 (diff)
downloadandroid_packages_apps_Trebuchet-0a1cc7da274dcf343b4fdc9c336d1f574b3f2133.tar.gz
android_packages_apps_Trebuchet-0a1cc7da274dcf343b4fdc9c336d1f574b3f2133.tar.bz2
android_packages_apps_Trebuchet-0a1cc7da274dcf343b4fdc9c336d1f574b3f2133.zip
Merge "Shrink-wrapping model to spec (issue 10397399)" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
-rw-r--r--src/com/android/launcher3/Launcher.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 99e4b0cdf..c282890ee 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3561,8 +3561,10 @@ public class Launcher extends Activity
public void bindScreens(ArrayList<Long> orderedScreenIds) {
bindAddScreens(orderedScreenIds);
- // Create the new empty page
- mWorkspace.addExtraEmptyScreen();
+ // If there are no screens, we need to have an empty screen
+ if (orderedScreenIds.size() == 0) {
+ mWorkspace.addExtraEmptyScreen();
+ }
// Create the custom content page (this call updates mDefaultScreen which calls
// setCurrentPage() so ensure that all pages are added before calling this)