am 02e53429: Merge "Don\'t block the UI when rearranging icons." into gingerbread

Merge commit '02e53429c4ef01bee548e0eaba4aeeee99db35f4'

* commit '02e53429c4ef01bee548e0eaba4aeeee99db35f4':
  Don't block the UI when rearranging icons.

diff --cc src/com/android/launcher2/LauncherModel.java
index d46ea07,b22d9ab..c686ee3
--- 1/src/com/android/launcher2/LauncherModel.java
--- 2/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@@ -159,11 -156,15 +160,15 @@@ public class LauncherModel extends Broa
          final ContentResolver cr = context.getContentResolver();
  
          values.put(LauncherSettings.Favorites.CONTAINER, item.container);
 -        values.put(LauncherSettings.Favorites.CELLX, item.cellX);
 -        values.put(LauncherSettings.Favorites.CELLY, item.cellY);
 +        values.put(LauncherSettings.Favorites.CELLX, cellX);
 +        values.put(LauncherSettings.Favorites.CELLY, cellY);
          values.put(LauncherSettings.Favorites.SCREEN, item.screen);
  
-         cr.update(LauncherSettings.Favorites.getContentUri(item.id, false), values, null, null);
+         new Thread("moveItemInDatabase") {
+             public void run() {
+                 cr.update(uri, values, null, null);
+             }
+         }.start();
      }
  
      /**