commit 5a91a354d96064dd3fcb6e5250b3904eeaec5c3b
author The Android Automerger <android-build@android.com> Wed Sep 28 07:09:40 2011 -0700
committer The Android Automerger <android-build@android.com> Wed Sep 28 07:09:40 2011 -0700
tree 67d3d7311ca1bdb6544aa412e9fc1b752cdaf7a6
parent 667a770068ce0c3713367cbec15fe5a515bef62f
parent 6ba07d609bbf5a516662f46ba9df4480afd272ca

merge in ics-release history after reset to master

res/xml/default_workspace.xml

diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml
index 61e8f3f..48e8eb7 100644
--- a/res/xml/default_workspace.xml
+++ b/res/xml/default_workspace.xml
@@ -19,14 +19,6 @@
 
     <!-- Left screen [1] -->
     <appwidget
-        launcher:packageName="com.google.android.apps.genie.geniewidget"
-        launcher:className="com.google.android.apps.genie.geniewidget.miniwidget.MiniWidgetProvider"
-        launcher:screen="1"
-        launcher:x="0"
-        launcher:y="1"
-        launcher:spanX="4"
-        launcher:spanY="1" />
-    <appwidget
         launcher:packageName="com.android.settings"
         launcher:className="com.android.settings.widget.SettingsAppWidgetProvider"
         launcher:screen="1"

src/com/android/launcher2/Folder.java

diff --git a/src/com/android/launcher2/Folder.java b/src/com/android/launcher2/Folder.java
index f44d3ed..71b7081 100644
--- a/src/com/android/launcher2/Folder.java
+++ b/src/com/android/launcher2/Folder.java
@@ -817,12 +817,14 @@
             lp.cellX = vacant[0];
             lp.cellY = vacant[1];
             ItemInfo info = (ItemInfo) v.getTag();
-            info.cellX = vacant[0];
-            info.cellY = vacant[1];
+            if (info.cellX != vacant[0] || info.cellY != vacant[1]) {
+                info.cellX = vacant[0];
+                info.cellY = vacant[1];
+                LauncherModel.addOrMoveItemInDatabase(mLauncher, info, mInfo.id, 0,
+                        info.cellX, info.cellY);
+            }
             boolean insert = false;
             mContent.addViewToCellLayout(v, insert ? 0 : -1, (int)info.id, lp, true);
-            LauncherModel.addOrMoveItemInDatabase(mLauncher, info, mInfo.id, 0,
-                    info.cellX, info.cellY);
         }
         mItemsInvalidated = true;
     }