Fix for issue 16736964 (fe9da818) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/DeleteDropTarget.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -129,11 +129,15 @@ public class DeleteDropTarget extends ButtonDropTarget {
		}

		private void setHoverColor() {
		if (mCurrentDrawable != null) {
		mCurrentDrawable.startTransition(mTransitionDuration);
		}
		setTextColor(mHoverColor);
		}
		private void resetHoverColor() {
		if (mCurrentDrawable != null) {
		mCurrentDrawable.resetTransition();
		}
		setTextColor(mOriginalTextColor);
		}

		@@ -242,8 +246,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
		final DragLayer dragLayer = mLauncher.getDragLayer();
		final Rect from = new Rect();
		dragLayer.getViewRectRelativeToSelf(d.dragView, from);

		int width = mCurrentDrawable == null ? 0 : mCurrentDrawable.getIntrinsicWidth();
		int height = mCurrentDrawable == null ? 0 : mCurrentDrawable.getIntrinsicHeight();
		final Rect to = getIconRect(d.dragView.getMeasuredWidth(), d.dragView.getMeasuredHeight(),
		mCurrentDrawable.getIntrinsicWidth(), mCurrentDrawable.getIntrinsicHeight());
		width, height);
		final float scale = (float) to.width() / from.width();

		mSearchDropTargetBar.deferOnDragEnd();
		@@ -364,8 +371,11 @@ public class DeleteDropTarget extends ButtonDropTarget {
		*/
		private AnimatorUpdateListener createFlingToTrashAnimatorListener(final DragLayer dragLayer,
		DragObject d, PointF vel, ViewConfiguration config) {

		int width = mCurrentDrawable == null ? 0 : mCurrentDrawable.getIntrinsicWidth();
		int height = mCurrentDrawable == null ? 0 : mCurrentDrawable.getIntrinsicHeight();
		final Rect to = getIconRect(d.dragView.getMeasuredWidth(), d.dragView.getMeasuredHeight(),
		mCurrentDrawable.getIntrinsicWidth(), mCurrentDrawable.getIntrinsicHeight());
		width, height);
		final Rect from = new Rect();
		dragLayer.getViewRectRelativeToSelf(d.dragView, from);