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

Merge "Fix issue with re-order animation not hinting the correct direction" into jb-dev

Browse Source
This commit is contained in:
Adam Cohen
2012-05-23 16:16:29 -07:00
committed by Android (Google) Code Review
parent 5eb21c9b1a fe41ac641b
commit 56734d7e86
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/CellLayout.java
+6 -4
View File
@@ -1942,13 +1942,15 @@ public class CellLayout extends ViewGroup {
if (dX == dY && dX == 0) {
} else {
if (dY == 0) {
deltaX = mReorderHintAnimationMagnitude;
deltaX = - Math.signum(dX) * mReorderHintAnimationMagnitude;
} else if (dX == 0) {
deltaY = mReorderHintAnimationMagnitude;
deltaY = - Math.signum(dY) * mReorderHintAnimationMagnitude;
} else {
double angle = Math.atan( (float) (dY) / dX);
deltaX = (int) (Math.cos(angle) * mReorderHintAnimationMagnitude);
deltaY = (int) (Math.sin(angle) * mReorderHintAnimationMagnitude);
deltaX = (int) (- Math.signum(dX) *
Math.abs(Math.cos(angle) * mReorderHintAnimationMagnitude));
deltaY = (int) (- Math.signum(dY) *
Math.abs(Math.sin(angle) * mReorderHintAnimationMagnitude));
}
}
child.setPivotY(child.getMeasuredHeight() * 0.5f);