am e1a71134: am 24b6fd85: Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen

Merge commit 'e1a71134e3227b43592b9699a716eba9c8669165' into eclair-mr2-plus-aosp

* commit 'e1a71134e3227b43592b9699a716eba9c8669165':
  Fix 2257802 - Screen unresponsive when you get a call while moving the shortcuts or widgets on home screen

src/com/android/launcher2/DragController.java

@@ -279,6 +279,13 @@ public class DragController {
         return mDragging;
     }
 
+    /**
+     * Stop dragging without dropping.
+     */
+    public void cancelDrag() {
+        endDrag();
+    }
+
     private void endDrag() {
         if (mDragging) {
             mDragging = false;
@@ -426,7 +433,7 @@ public class DragController {
 
             break;
         case MotionEvent.ACTION_CANCEL:
-            endDrag();
+            cancelDrag();
         }
 
         return true;

src/com/android/launcher2/Launcher.java

@@ -437,6 +437,7 @@ public final class Launcher extends Activity
         super.onPause();
         dismissPreview(mPreviousView);
         dismissPreview(mNextView);
+        mDragController.cancelDrag();
     }
 
     @Override