diff options
Diffstat (limited to 'src/com/android/launcher3/ButtonDropTarget.java')
| -rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 0f6073eee..cf8abae2e 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -43,6 +43,7 @@ import android.widget.TextView; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.dragndrop.DragOptions; import com.android.launcher3.dragndrop.DragView; import com.android.launcher3.util.Thunk; @@ -199,8 +200,8 @@ public abstract class ButtonDropTarget extends TextView } @Override - public void onDragStart(DragSource source, ItemInfo info, int dragAction) { - mActive = supportsDrop(source, info); + public void onDragStart(DropTarget.DragObject dragObject, DragOptions options) { + mActive = supportsDrop(dragObject.dragSource, dragObject.dragInfo); mDrawable.setColorFilter(null); if (mCurrentColorAnim != null) { mCurrentColorAnim.cancel(); @@ -209,6 +210,9 @@ public abstract class ButtonDropTarget extends TextView setTextColor(mOriginalTextColor); (mHideParentOnDisable ? ((ViewGroup) getParent()) : this) .setVisibility(mActive ? View.VISIBLE : View.GONE); + + mAccessibleDrag = options.isAccessibleDrag; + setOnClickListener(mAccessibleDrag ? this : null); } @Override @@ -227,6 +231,7 @@ public abstract class ButtonDropTarget extends TextView @Override public void onDragEnd() { mActive = false; + setOnClickListener(null); } /** @@ -254,7 +259,8 @@ public abstract class ButtonDropTarget extends TextView } }; dragLayer.animateView(d.dragView, from, to, scale, 1f, 1f, 0.1f, 0.1f, - DRAG_VIEW_DROP_DURATION, new DecelerateInterpolator(2), + mLauncher.getDragController().isExternalDrag() ? 1 : DRAG_VIEW_DROP_DURATION, + new DecelerateInterpolator(2), new LinearInterpolator(), onAnimationEndRunnable, DragLayer.ANIMATION_END_DISAPPEAR, null); } @@ -308,11 +314,6 @@ public abstract class ButtonDropTarget extends TextView return to; } - public void enableAccessibleDrag(boolean enable) { - mAccessibleDrag = enable; - setOnClickListener(enable ? this : null); - } - @Override public void onClick(View v) { mLauncher.getAccessibilityDelegate().handleAccessibleDrop(this, null, null); |