PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing up some folder-related drag and drop bugs

Browse Source 
Change-Id: I712ffd0ccfc0154a5a9e74e3f585157a86986882
This commit is contained in:
Adam Cohen
2011-06-09 15:06:52 -07:00
parent c0dcf59708
commit 76078c4ef3
4 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Workspace.java
+44 -41
View File
@@ -2350,23 +2350,11 @@ public class Workspace extends SmoothPagedView
lp.oldY = viewY - (layout.getTop() + layout.getTopPadding() - mScrollY);
}
/*
* We should be careful that this method cannot result in any synchronous requestLayout()
* calls, as it is called from onLayout().
*/
public void animateViewIntoPosition(final View view) {
final CellLayout parent = (CellLayout) view.getParent().getParent();
final CellLayout.LayoutParams lp = (CellLayout.LayoutParams) view.getLayoutParams();
// Convert the animation params to be relative to the Workspace, not the CellLayout
final int fromX = lp.oldX + parent.getLeft() + parent.getLeftPadding();
final int fromY = lp.oldY + parent.getTop() + parent.getTopPadding();
final int dx = lp.x - lp.oldX;
final int dy = lp.y - lp.oldY;
public void animateViewIntoPosition(final View view, final int fromX, final int fromY,
final int dX, final int dY, final Runnable animationEndRunnable) {
// Calculate the duration of the animation based on the object's distance
final float dist = (float) Math.sqrt(dx*dx + dy*dy);
final float dist = (float) Math.sqrt(dX*dX + dY*dY);
final Resources res = getResources();
final float maxDist = (float) res.getInteger(R.integer.config_dropAnimMaxDist);
int duration = res.getInteger(R.integer.config_dropAnimMaxDuration);
@@ -2388,10 +2376,7 @@ public class Workspace extends SmoothPagedView
}
public void onAnimationEnd(Animator animation) {
if (mDropView != null) {
mDropView.setVisibility(View.VISIBLE);
mDropView = null;
}
animationEndRunnable.run();
}
});
@@ -2405,8 +2390,8 @@ public class Workspace extends SmoothPagedView
invalidate(mDropViewPos[0], mDropViewPos[1],
mDropViewPos[0] + view.getWidth(), mDropViewPos[1] + view.getHeight());
mDropViewPos[0] = fromX + (int) (percent * dx + 0.5f);
mDropViewPos[1] = fromY + (int) (percent * dy + 0.5f);
mDropViewPos[0] = fromX + (int) (percent * dX + 0.5f);
mDropViewPos[1] = fromY + (int) (percent * dY + 0.5f);
invalidate(mDropViewPos[0], mDropViewPos[1],
mDropViewPos[0] + view.getWidth(), mDropViewPos[1] + view.getHeight());
}
@@ -2415,6 +2400,32 @@ public class Workspace extends SmoothPagedView
mDropAnim.start();
}
/*
* We should be careful that this method cannot result in any synchronous requestLayout()
* calls, as it is called from onLayout().
*/
public void animateViewIntoPosition(final View view) {
final CellLayout parent = (CellLayout) view.getParent().getParent();
final CellLayout.LayoutParams lp = (CellLayout.LayoutParams) view.getLayoutParams();
// Convert the animation params to be relative to the Workspace, not the CellLayout
final int fromX = lp.oldX + parent.getLeft() + parent.getLeftPadding();
final int fromY = lp.oldY + parent.getTop() + parent.getTopPadding();
final int dx = lp.x - lp.oldX;
final int dy = lp.y - lp.oldY;
Runnable animationEndRunnable = new Runnable() {
public void run() {
if (mDropView != null) {
mDropView.setVisibility(View.VISIBLE);
mDropView = null;
}
}
};
animateViewIntoPosition(view, fromX, fromY, dx, dy, animationEndRunnable);
}
/**
* {@inheritDoc}
*/
@@ -2530,6 +2541,7 @@ public class Workspace extends SmoothPagedView
scrollToNewPageWithoutMovingPages(dragTargetIndex);
}
}
CellLayout dropTargetLayout = mDragTargetLayout;
if (d.dragSource != this) {
final int[] touchXY = new int[] { (int) mDragViewVisualCenter[0],
@@ -2541,22 +2553,9 @@ public class Workspace extends SmoothPagedView
((ItemInfo) d.dragInfo).dropPos = touchXY;
return;
}
onDropExternal(touchXY, d.dragInfo, mDragTargetLayout, false, d.dragView);
onDropExternal(touchXY, d.dragInfo, dropTargetLayout, false, d.dragView);
} else if (mDragInfo != null) {
final View cell = mDragInfo.cell;
CellLayout dropTargetLayout = mDragTargetLayout;
boolean dropInscrollArea = false;
// Handle the case where the user drops when in the scroll area.
// This is treated as a drop on the adjacent page.
if (dropTargetLayout == null && mInScrollArea) {
dropInscrollArea = true;
if (mPendingScrollDirection == DragController.SCROLL_LEFT) {
dropTargetLayout = (CellLayout) getChildAt(mCurrentPage - 1);
} else if (mPendingScrollDirection == DragController.SCROLL_RIGHT) {
dropTargetLayout = (CellLayout) getChildAt(mCurrentPage + 1);
}
}
if (dropTargetLayout != null) {
// Move internally
@@ -2570,8 +2569,9 @@ public class Workspace extends SmoothPagedView
mTargetCell = findNearestArea((int) mDragViewVisualCenter[0], (int)
mDragViewVisualCenter[1], spanX, spanY, dropTargetLayout, mTargetCell);
// If the item being dropped is a shortcut and the nearest drop
// cell also contains
// a shortcut, then create a folder with the two shortcuts.
// cell also contains a shortcut, then create a folder with the two shortcuts.
boolean dropInscrollArea = mCurrentPage != screen;
if (!dropInscrollArea && createUserFolderIfNecessary(cell, dropTargetLayout,
mTargetCell, false)) {
return;
@@ -2588,7 +2588,7 @@ public class Workspace extends SmoothPagedView
(int) mDragViewVisualCenter[1], mDragInfo.spanX, mDragInfo.spanY, cell,
dropTargetLayout, mTargetCell);
if (screen != mCurrentPage) {
if (dropInscrollArea && mShrinkState != ShrinkState.SPRING_LOADED) {
snapToPage(screen);
}
@@ -2600,6 +2600,7 @@ public class Workspace extends SmoothPagedView
mDragInfo.spanY);
}
// update the item's position after drop
final ItemInfo info = (ItemInfo) cell.getTag();
CellLayout.LayoutParams lp = (CellLayout.LayoutParams) cell.getLayoutParams();
@@ -2655,7 +2656,7 @@ public class Workspace extends SmoothPagedView
}
}
private void getViewLocationRelativeToSelf(View v, int[] location) {
public void getViewLocationRelativeToSelf(View v, int[] location) {
getLocationOnScreen(location);
int x = location[0];
int y = location[1];
@@ -3113,7 +3114,6 @@ public class Workspace extends SmoothPagedView
if (dragOverView != mLastDragOverView) {
cancelFolderCreation();
if (mLastDragOverView != null && mLastDragOverView instanceof FolderIcon) {
((FolderIcon) mLastDragOverView).onDragExit(d.dragInfo);
}
}
@@ -3249,6 +3249,9 @@ public class Workspace extends SmoothPagedView
private void onDropExternal(int[] touchXY, Object dragInfo,
CellLayout cellLayout, boolean insertAtFirst, DragView dragView) {
int screen = indexOfChild(cellLayout);
if (screen != mCurrentPage && mShrinkState != ShrinkState.SPRING_LOADED) {
snapToPage(screen);
}
if (dragInfo instanceof PendingAddItemInfo) {
PendingAddItemInfo info = (PendingAddItemInfo) dragInfo;
// When dragging and dropping from customization tray, we deal with creating
@@ -3452,7 +3455,7 @@ public class Workspace extends SmoothPagedView
if (mDragTargetLayout != null) {
mDragTargetLayout.onDragExit();
mDragTargetLayout = null;
mDragTargetLayout = layout;
}
// In portrait, need to redraw the edge glow when entering the scroll area
if (getHeight() > getWidth()) {