Removing logging related to and fixing (issue 6238330)
Change-Id: I7ed89840d90fd13cbfedc795e789706b32f76b5d
diff --git a/src/com/android/launcher2/AppsCustomizePagedView.java b/src/com/android/launcher2/AppsCustomizePagedView.java
index 4712a37..618d62e 100644
--- a/src/com/android/launcher2/AppsCustomizePagedView.java
+++ b/src/com/android/launcher2/AppsCustomizePagedView.java
@@ -614,24 +614,18 @@
@Override
public void onShortPress(View v) {
- Log.d(TAG, "onShortPress, view: " + v);
// We are anticipating a long press, and we use this time to load bind and instantiate
// the widget. This will need to be cleaned up if it turns out no long press occurs.
if (mCreateWidgetInfo != null) {
- Log.d(TAG, "onShortPress --> cleanup previous, view: " + v + ", create info: " + mCreateWidgetInfo);
// Just in case the cleanup process wasn't properly executed. This shouldn't happen.
cleanupWidgetPreloading(false);
}
mCreateWidgetInfo = new PendingAddWidgetInfo((PendingAddWidgetInfo) v.getTag());
- Log.d(TAG, "onShortPress --> create widget info: " + mCreateWidgetInfo);
preloadWidget(mCreateWidgetInfo);
}
private void cleanupWidgetPreloading(boolean widgetWasAdded) {
- Log.d(TAG, "cleanup widget preloading");
-
if (!widgetWasAdded) {
- Log.d(TAG, "cleanup widget preloading --> widget wasn't added");
// If the widget was not added, we may need to do further cleanup.
PendingAddWidgetInfo info = mCreateWidgetInfo;
mCreateWidgetInfo = null;
@@ -657,9 +651,7 @@
@Override
public void cleanUpShortPress(View v) {
- Log.d(TAG, "cleanup shortpress, view: " + v);
if (!mDraggingWidget) {
- Log.d(TAG, "cleanup shortpress --> cleanup preloading");
cleanupWidgetPreloading(false);
}
}
@@ -675,7 +667,6 @@
// If the ImageView doesn't have a drawable yet, the widget preview hasn't been loaded and
// we abort the drag.
if (image.getDrawable() == null) {
- Log.d(TAG, "begin dragging widget, no drawable");
mDraggingWidget = false;
return false;
}
@@ -683,7 +674,6 @@
// 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) {
- Log.d(TAG, "begin dragging widget, create widget info null");
return false;
}
diff --git a/src/com/android/launcher2/PagedViewWidget.java b/src/com/android/launcher2/PagedViewWidget.java
index a6ea78f..e894142 100644
--- a/src/com/android/launcher2/PagedViewWidget.java
+++ b/src/com/android/launcher2/PagedViewWidget.java
@@ -144,8 +144,8 @@
if (sShortpressTarget != null) return;
if (mShortPressListener != null) {
mShortPressListener.onShortPress(PagedViewWidget.this);
+ sShortpressTarget = PagedViewWidget.this;
}
- sShortpressTarget = PagedViewWidget.this;
mShortPressTriggered = true;
}
}