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

am e21a9405: am 4349d2d2: am 28f852ab: Fix drop animation issue in springloaded

Browse Source 
* commit 'e21a94058895509298680f9fbc36dc9b94e043c2':
  Fix drop animation issue in springloaded
This commit is contained in:
Adam Cohen
2014-02-14 20:52:14 +00:00
committed by Android Git Automerger
parent 0fc0cd0d37 e21a940588
commit 58999a45f9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DragLayer.java
+7 -5
View File
@@ -480,7 +480,7 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
}
public void animateViewIntoPosition(DragView dragView, final View child) {
animateViewIntoPosition(dragView, child, null);
animateViewIntoPosition(dragView, child, null, null);
}
public void animateViewIntoPosition(DragView dragView, final int[] pos, float alpha,
@@ -496,8 +496,8 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
}
public void animateViewIntoPosition(DragView dragView, final View child,
final Runnable onFinishAnimationRunnable) {
animateViewIntoPosition(dragView, child, -1, onFinishAnimationRunnable, null);
final Runnable onFinishAnimationRunnable, View anchorView) {
animateViewIntoPosition(dragView, child, -1, onFinishAnimationRunnable, anchorView);
}
public void animateViewIntoPosition(DragView dragView, final View child, int duration,
@@ -645,8 +645,10 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
int x = (int) (fromLeft + Math.round(((to.left - fromLeft) * motionPercent)));
int y = (int) (fromTop + Math.round(((to.top - fromTop) * motionPercent)));
int xPos = x - mDropView.getScrollX() + (mAnchorView != null
? (mAnchorViewInitialScrollX - mAnchorView.getScrollX()) : 0);
int anchorAdjust = mAnchorView == null ? 0 : (int) (mAnchorView.getScaleX() *
(mAnchorViewInitialScrollX - mAnchorView.getScrollX()));
int xPos = x - mDropView.getScrollX() + anchorAdjust;
int yPos = y - mDropView.getScrollY();
mDropView.setTranslationX(xPos);
src/com/android/launcher3/Workspace.java
+1 -1
View File
@@ -3654,7 +3654,7 @@ public class Workspace extends SmoothPagedView
// the correct final location.
setFinalTransitionTransform(cellLayout);
mLauncher.getDragLayer().animateViewIntoPosition(d.dragView, view,
exitSpringLoadedRunnable);
exitSpringLoadedRunnable, this);
resetTransitionTransform(cellLayout);
}
}