resolved conflicts for merge of 700889f5 to master

Change-Id: I85320de6483e6820fe27b4012bfc323ccafa0e04

diff --cc src/com/android/launcher2/LauncherModel.java
index c686ee3,cb19fe3..eff5ed6
--- 1/src/com/android/launcher2/LauncherModel.java
--- 2/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@@ -47,11 -38,21 +47,21 @@@ import android.net.Uri
  import android.os.Handler;
  import android.os.HandlerThread;
  import android.os.Parcelable;
 -import android.os.RemoteException;
 -import android.util.Log;
  import android.os.Process;
 +import android.os.RemoteException;
  import android.os.SystemClock;
 +import android.util.Log;
  
+ import java.lang.ref.WeakReference;
+ import java.net.URISyntaxException;
+ import java.text.Collator;
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.HashMap;
+ import java.util.List;
+ 
  import com.android.launcher.R;
  
  /**
@@@ -160,15 -156,15 +170,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);
  
-         new Thread("moveItemInDatabase") {
-             public void run() {
-                 cr.update(uri, values, null, null);
-             }
-         }.start();
+         sWorker.post(new Runnable() {
+                 public void run() {
+                     cr.update(uri, values, null, null);
+                 }
+             });
      }
  
      /**