openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for issue 16736964 

Change-Id: If150db98346fe10f62fc1160309b66d7a19e9022
This commit is contained in:
Adam Cohen 2014-08-04 17:08:01 -07:00
parent f07af7b77d
commit fe9da818cd
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/launcher3/DeleteDropTarget.java
View File

@ -129,11 +129,15 @@ public class DeleteDropTarget extends ButtonDropTarget {
}
private void setHoverColor() {
mCurrentDrawable.startTransition(mTransitionDuration);
if (mCurrentDrawable != null) {
mCurrentDrawable.startTransition(mTransitionDuration);
}
setTextColor(mHoverColor);
}
private void resetHoverColor() {
mCurrentDrawable.resetTransition();
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);