mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-19 18:58:19 +00:00
Merge "Simplifying the drop animation code" into sc-v2-dev
This commit is contained in:
@@ -2732,9 +2732,6 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
public void animateWidgetDrop(ItemInfo info, CellLayout cellLayout, final DragView dragView,
|
||||
final Runnable onCompleteRunnable, int animationType, final View finalView,
|
||||
boolean external) {
|
||||
Rect from = new Rect();
|
||||
mLauncher.getDragLayer().getViewRectRelativeToSelf(dragView, from);
|
||||
|
||||
int[] finalPos = new int[2];
|
||||
float scaleXY[] = new float[2];
|
||||
boolean scalePreview = !(info instanceof PendingAddShortcutInfo);
|
||||
@@ -2778,8 +2775,8 @@ public class Workspace extends PagedView<WorkspacePageIndicator>
|
||||
}
|
||||
}
|
||||
};
|
||||
dragLayer.animateViewIntoPosition(dragView, from.left, from.top, finalPos[0],
|
||||
finalPos[1], 1, 1, 1, scaleXY[0], scaleXY[1], onComplete, endStyle,
|
||||
dragLayer.animateViewIntoPosition(dragView, finalPos[0],
|
||||
finalPos[1], 1, scaleXY[0], scaleXY[1], onComplete, endStyle,
|
||||
duration, this);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user