aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move drop anim into the Workspace to prevent clipping issues

Browse Source
This commit is contained in:
Patrick Dubroy
2010-10-28 17:57:05 -07:00
parent a997ac2666
commit cd68ff5b88
2 changed files with 140 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/launcher2/CellLayout.java
View File

@@ -125,7 +125,6 @@ public class CellLayout extends ViewGroup implements Dimmable {
private boolean mDragging = false;
private ValueAnimator mDropAnim;
private TimeInterpolator mEaseOutInterpolator;
public CellLayout(Context context) {
@@ -255,9 +254,6 @@ public class CellLayout extends ViewGroup implements Dimmable {
mDragOutlineAnims[i] = anim;
}
mDropAnim = ValueAnimator.ofFloat(1.0f, 0.0f);
mDropAnim.setInterpolator(mEaseOutInterpolator);
mBackgroundRect = new Rect();
mHoverRect = new Rect();
setHoverScale(1.0f);
@@ -776,37 +772,6 @@ public class CellLayout extends ViewGroup implements Dimmable {
}
}
/**
* Animate a child of this CellLayout into its current layout position.
* The position to animate from is given by the oldX and oldY values in its LayoutParams.
*/
private void animateChildIntoPosition(final View child) {
final Resources res = getResources();
final ValueAnimator anim = mDropAnim;
final CellLayout.LayoutParams lp = (CellLayout.LayoutParams) child.getLayoutParams();
final float startX = lp.oldX - lp.x;
final float startY = lp.oldY - lp.y;
// Calculate the duration of the animation based on the object's distance
final float dist = (float) Math.sqrt(startX*startX + startY*startY);
final float maxDist = (float) res.getInteger(R.integer.config_dropAnimMaxDist);
final int duration = (int) (res.getInteger(R.integer.config_dropAnimMaxDuration)
* mEaseOutInterpolator.getInterpolation(dist / maxDist));
anim.end(); // Make sure it's not already running
anim.setDuration(duration);
anim.setFloatValues(1.0f, 0.0f);
anim.removeAllUpdateListeners();
anim.addUpdateListener(new AnimatorUpdateListener() {
public void onAnimationUpdate(ValueAnimator animation) {
final float value = (Float) anim.getAnimatedValue();
child.setTranslationX(startX * value);
child.setTranslationY(startY * value);
}
});
anim.start();
}
@Override
protected void onLayout(boolean changed, int l, int t, int r, int b) {
int count = getChildCount();
@@ -830,7 +795,7 @@ public class CellLayout extends ViewGroup implements Dimmable {
cellXY[0] + childLeft + lp.width / 2,
cellXY[1] + childTop + lp.height / 2, 0, null);
animateChildIntoPosition(child);
((Workspace) mParent).animateViewIntoPosition(child);
}
}
}
@@ -1259,15 +1224,6 @@ public class CellLayout extends ViewGroup implements Dimmable {
}
}
void onDropAborted(View child) {
if (child != null) {
LayoutParams lp = (LayoutParams) child.getLayoutParams();
lp.isDragging = false;
child.setVisibility(View.VISIBLE);
animateChildIntoPosition(child);
}
}
/**
* Start dragging the specified child
*