Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in calculating path in ArcMotion"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-08 15:43:50 +00:00
committed by Android (Google) Code Review
parent 71a24be984 575ffb856e
commit a20833c06d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/transition/ArcMotion.java
View File

@@ -216,7 +216,13 @@ public class ArcMotion extends PathMotion {
boolean isMovingUpwards = startY > endY;
if ((Math.abs(deltaX) < Math.abs(deltaY))) {
if (deltaY == 0) {
ex = dx;
ey = dy + (Math.abs(deltaX) * 0.5f * mMinimumHorizontalTangent);
} else if (deltaX == 0) {
ex = dx + (Math.abs(deltaY) * 0.5f * mMinimumVerticalTangent);
ey = dy;
} else if ((Math.abs(deltaX) < Math.abs(deltaY))) {
// Similar triangles bfa and bde mean that (ab/fb = eb/bd)
// Therefore, eb = ab * bd / fb
// ab = hypotenuse
@@ -254,7 +260,7 @@ public class ArcMotion extends PathMotion {
float maximumArcDist2 = midDist2 * mMaximumTangent * mMaximumTangent;
float newArcDistance2 = 0;
if (arcDist2 < minimumArcDist2) {
if (arcDist2 != 0 && arcDist2 < minimumArcDist2) {
newArcDistance2 = minimumArcDist2;
} else if (arcDist2 > maximumArcDist2) {
newArcDistance2 = maximumArcDist2;