aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improving widget transitions:

Browse Source 
-> When a widget has no configuration activity, we bind
   and inflate it when the user picks it up. This allows
   us to smoothly transition between it's preview and
   some actual state of the widget when it is dropped.
-> When a widget has a configuration activity, we delay
   the above process until the configuration activity
   has been run at which time we transition between
   the preview and the actual widget.

Change-Id: I5265cd98400d70e5e75c3dcd21e322ed0b352d7b
This commit is contained in:
Adam Cohen
2012-01-23 17:28:51 -08:00
parent 933cc50611
commit ed66b2bac7
9 changed files with 465 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/com/android/launcher2/DeleteDropTarget.java
View File

@@ -165,23 +165,30 @@ public class DeleteDropTarget extends ButtonDropTarget {
}
}
private void animateToTrashAndCompleteDrop(final DragObject d) {
Rect getDeleteRect(int deleteItemWidth, int deleteItemHeight) {
DragLayer dragLayer = mLauncher.getDragLayer();
Rect from = new Rect();
Rect to = new Rect();
dragLayer.getViewRectRelativeToSelf(d.dragView, from);
dragLayer.getViewRectRelativeToSelf(this, to);
Rect to = new Rect();
dragLayer.getViewRectRelativeToSelf(this, to);
int width = mCurrentDrawable.getIntrinsicWidth();
int height = mCurrentDrawable.getIntrinsicHeight();
to.set(to.left + getPaddingLeft(), to.top + getPaddingTop(),
to.left + getPaddingLeft() + width, to.bottom);
// Center the destination rect about the trash icon
int xOffset = (int) -(d.dragView.getMeasuredWidth() - width) / 2;
int yOffset = (int) -(d.dragView.getMeasuredHeight() - height) / 2;
int xOffset = (int) -(deleteItemWidth - width) / 2;
int yOffset = (int) -(deleteItemHeight - height) / 2;
to.offset(xOffset, yOffset);
return to;
}
private void animateToTrashAndCompleteDrop(final DragObject d) {
DragLayer dragLayer = mLauncher.getDragLayer();
Rect from = new Rect();
dragLayer.getViewRectRelativeToSelf(d.dragView, from);
Rect to = getDeleteRect(d.dragView.getMeasuredWidth(), d.dragView.getMeasuredHeight());
mSearchDropTargetBar.deferOnDragEnd();
Runnable onAnimationEndRunnable = new Runnable() {
@Override
@@ -191,9 +198,10 @@ public class DeleteDropTarget extends ButtonDropTarget {
completeDrop(d);
}
};
dragLayer.animateView(d.dragView, from, to, 0.1f, 0.1f,
dragLayer.animateView(d.dragView, from, to, 0.1f, 1, 1, 0.1f, 0.1f,
DELETE_ANIMATION_DURATION, new DecelerateInterpolator(2),
new DecelerateInterpolator(1.5f), onAnimationEndRunnable, false, null);
new DecelerateInterpolator(1.5f), onAnimationEndRunnable,
DragLayer.ANIMATION_END_DISAPPEAR, null);
}
private void completeDrop(DragObject d) {