commit 6dc8f7c856f51223213c4106ebe9320f15f01013
author Winson Chung <winsonc@google.com> Tue Nov 19 20:02:19 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 19 20:02:19 2013 +0000
tree b379012ff169589f079a15e6bb6691d6743f1980
parent f0b8dacf1516e0d901c71109c906dc15ef855fc5
parent f0716b7a7475fc80a97fd6f95efecab570d186fb

Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6c58a37..f8db240 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -690,7 +690,8 @@
             mWorkspaceScreens.put(EXTRA_EMPTY_SCREEN_ID, finalScreen);
             mScreenOrder.add(EXTRA_EMPTY_SCREEN_ID);
 
-            // XXX: Do we need to update LM workspace screens here?
+            // Update the model if we have changed any screens
+            mLauncher.getModel().updateWorkspaceScreenOrder(mLauncher, mScreenOrder);
             Launcher.addDumpLog(TAG, "11683562 -   extra empty screen: " + finalScreenId, true);
         }
     }