commit 059bba1da5e264853e26a391b9a844dc3c48d945
author The Android Automerger <android-build@android.com> Wed Jan 05 12:01:49 2011 -0800
committer The Android Automerger <android-build@android.com> Wed Jan 05 12:01:49 2011 -0800
tree be5d04ad85d4b94b3bb8e7e4f6ce2c96f9000f19
parent 34a75b4ecca6526bef1daf9f1f246ba64be44c42
parent e59f137e83162cdb6284d41a478788d954d6ef46

merge in honeycomb-release history after reset to master

res/layout-xlarge-land/launcher.xml

diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml
index b682317..93d19dc 100644
--- a/res/layout-xlarge-land/launcher.xml
+++ b/res/layout-xlarge-land/launcher.xml
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingRight="32dp"
                     android:paddingTop="12dp"
                     android:src="@drawable/search_button_generic"
                     android:background="@drawable/button_bg"
@@ -92,8 +92,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="24dp"
                     android:paddingTop="12dp"
                     android:src="@drawable/ic_voice_search"
                     android:background="@drawable/button_bg"

res/layout-xlarge-port/launcher.xml

diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml
index 40b947e..6ad5d9c 100644
--- a/res/layout-xlarge-port/launcher.xml
+++ b/res/layout-xlarge-port/launcher.xml
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
                     android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingRight="32dp"
                     android:paddingTop="12dp"
                     android:src="@drawable/search_button_generic"
                     android:background="@drawable/button_bg"
@@ -92,8 +92,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom"
-                    android:paddingLeft="8dp"
-                    android:paddingRight="8dp"
+                    android:paddingLeft="24dp"
+                    android:paddingRight="24dp"
                     android:paddingTop="12dp"
                     android:src="@drawable/ic_voice_search"
                     android:background="@drawable/button_bg"

src/com/android/launcher2/DragController.java

diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java
index 876ad87..0f24cd9 100644
--- a/src/com/android/launcher2/DragController.java
+++ b/src/com/android/launcher2/DragController.java
@@ -394,6 +394,9 @@
      * Stop dragging without dropping.
      */
     public void cancelDrag() {
+        if (mDragging) {
+            mDragSource.onDropCompleted(null, false);
+        }
         endDrag();
     }
 
@@ -433,21 +436,21 @@
         switch (action) {
             case MotionEvent.ACTION_MOVE:
                 break;
-
             case MotionEvent.ACTION_DOWN:
                 // Remember location of down touch
                 mMotionDownX = screenX;
                 mMotionDownY = screenY;
                 mLastDropTarget = null;
                 break;
-
-            case MotionEvent.ACTION_CANCEL:
             case MotionEvent.ACTION_UP:
                 if (mDragging) {
                     drop(screenX, screenY);
                 }
                 endDrag();
                 break;
+            case MotionEvent.ACTION_CANCEL:
+                cancelDrag();
+                break;
         }
 
         return mDragging;
@@ -568,10 +571,10 @@
                 drop(screenX, screenY);
             }
             endDrag();
-
             break;
         case MotionEvent.ACTION_CANCEL:
             cancelDrag();
+            break;
         }
 
         return true;