commit eb0cc542fad264d53f8d31e6421aa0f8833ffd3b
author Baligh Uddin <baligh@google.com> Mon Sep 30 22:25:51 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 30 22:25:51 2013 +0000
tree cc84a420b5ce80ea118b7b96e62d50a17378a320
parent 0f84a604563037ea65883b99d30e7ff802d986c2
parent c83dfbea5177ca3faeea72a9f9b970d5c77547ef

Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index f8644b1..cc89d01 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -694,6 +694,7 @@
      */
     static void modifyItemInDatabase(Context context, final ItemInfo item, final long container,
             final long screenId, final int cellX, final int cellY, final int spanX, final int spanY) {
+        item.container = container;
         item.cellX = cellX;
         item.cellY = cellY;
         item.spanX = spanX;

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index baddc2d..132f42d 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1024,6 +1024,12 @@
             stripEmptyScreens();
             mStripScreensOnPageStopMoving = false;
         }
+    }
+
+    @Override
+    protected void notifyPageSwitchListener() {
+        super.notifyPageSwitchListener();
+        Launcher.setScreen(mCurrentPage);
 
         if (hasCustomContent() && getNextPage() == 0 && !mCustomContentShowing) {
             mCustomContentShowing = true;
@@ -1040,12 +1046,6 @@
                 mLauncher.setVoiceButtonProxyVisible(true);
             }
         }
-    }
-
-    @Override
-    protected void notifyPageSwitchListener() {
-        super.notifyPageSwitchListener();
-        Launcher.setScreen(mCurrentPage);
     };
 
     protected void setWallpaperDimension() {