commit 5084cbab0eb0c06bd2778e0a48efaf392717cd10
author Adam Cohen <adamcohen@google.com> Tue Sep 03 12:01:16 2013 -0700
committer Adam Cohen <adamcohen@google.com> Fri Sep 13 16:02:44 2013 -0700
tree c0865ca5cb956b9e4a8ada1198a06d0cedcfa28b
parent d5066bebd896d4d060fa9d76d9d214b9e130c12d

Shrink-wrapping model to spec (issue 10397399)

Change-Id: I87e32e8bd93f3b0468bc840200faed8270922a03

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 29c4e3e..fbc6819 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -3560,8 +3560,10 @@
     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)