diff options
| author | Winson Chung <winsonc@google.com> | 2011-01-07 11:17:23 -0800 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2011-01-07 16:00:59 -0800 |
| commit | 304dcde0e301c2f1a0b2bdc80ea8617930691b6e (patch) | |
| tree | 699fcf5f04a7e322b649ff60aba6ac8e3f51d990 /src/com/android/launcher2/CustomizePagedView.java | |
| parent | 815ba2d2eabded5ffee53fba668d63ca9173e6fd (diff) | |
| download | android_packages_apps_Trebuchet-304dcde0e301c2f1a0b2bdc80ea8617930691b6e.tar.gz android_packages_apps_Trebuchet-304dcde0e301c2f1a0b2bdc80ea8617930691b6e.tar.bz2 android_packages_apps_Trebuchet-304dcde0e301c2f1a0b2bdc80ea8617930691b6e.zip | |
Ensuring that we don't start dragging while another drag is in progress.
Change-Id: If3c5a059407efc3ee9a0c9b1b3b7fb942d3a7664
Diffstat (limited to 'src/com/android/launcher2/CustomizePagedView.java')
| -rw-r--r-- | src/com/android/launcher2/CustomizePagedView.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher2/CustomizePagedView.java b/src/com/android/launcher2/CustomizePagedView.java index 0b874bc11..6a563f28b 100644 --- a/src/com/android/launcher2/CustomizePagedView.java +++ b/src/com/android/launcher2/CustomizePagedView.java @@ -492,12 +492,13 @@ public class CustomizePagedView extends PagedViewWithDraggableItems } protected boolean beginDragging(View v) { + if (!v.isInTouchMode()) return false; + if (!super.beginDragging(v)) return false; + // End the current choice mode before we start dragging anything if (isChoiceMode(CHOICE_MODE_SINGLE)) { endChoiceMode(); } - super.beginDragging(v); - boolean result = false; switch (mCustomizationType) { case WidgetCustomization: { |