summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-11-19 12:05:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-19 12:05:16 -0800
commit2e06b6dac2f88307e7e3a3e25031949f14a9fc51 (patch)
tree50d3b1424e4805f9842b186924846a238de54150 /src
parent91d30b76779a7911e4252a68c0b70a154b3295c5 (diff)
parent6dc8f7c856f51223213c4106ebe9320f15f01013 (diff)
downloadandroid_packages_apps_Trebuchet-2e06b6dac2f88307e7e3a3e25031949f14a9fc51.tar.gz
android_packages_apps_Trebuchet-2e06b6dac2f88307e7e3a3e25031949f14a9fc51.tar.bz2
android_packages_apps_Trebuchet-2e06b6dac2f88307e7e3a3e25031949f14a9fc51.zip
am 6dc8f7c8: Merge "Update the database when converting the final screen. (Bug 11683562, Bug 11034205)" into jb-ub-now-jolly-elf
* commit '6dc8f7c856f51223213c4106ebe9320f15f01013': Update the database when converting the final screen. (Bug 11683562, Bug 11034205)
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Workspace.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 6c58a375b..f8db240e0 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -690,7 +690,8 @@ public class Workspace extends SmoothPagedView
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);
}
}