am 534ea47f: Merge "Yet another attempt to fix (issue 6282761)" into jb-dev

* commit '534ea47ffd3a0c3c2e2c883200926393110d174c':
  Yet another attempt to fix (issue 6282761)
This commit is contained in:
Adam Cohen authored and Android Git Automerger committed 2012-05-16 17:22:17 -07:00
commit a4d6531ab3
2 files changed
+7 -1

No files matched your search

@@ -669,6 +669,12 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
return false;
}
// This can happen in some weird cases involving multi-touch. We can't start dragging the
// widget if this is null, so we break out.
if (mCreateWidgetInfo == null) {
return false;
}
// Compose the drag image
Bitmap preview;
Bitmap outline;
@@ -141,8 +141,8 @@ public class PagedViewWidget extends LinearLayout {
class CheckForShortPress implements Runnable {
public void run() {
if (sShortpressTarget != null) return;
if (mShortPressListener != null) {
if (sShortpressTarget != null) return;
mShortPressListener.onShortPress(PagedViewWidget.this);
}
sShortpressTarget = PagedViewWidget.this;