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

Merge "Fix ArcMotion path creation in some quadrants." into nyc-dev

Browse Source 
am: fdce57b6dc

* commit 'fdce57b6dc931c6d038117d34b70e97a22de2b27':
  Fix ArcMotion path creation in some quadrants.
This commit is contained in:
George Mount
2016-03-10 18:24:47 +00:00
committed by android-build-merger
parent 55de25c00a fdce57b6dc
commit 28f3738335
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,13 +15,13 @@
*/
package android.transition;
import com.android.internal.R;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Path;
import android.util.AttributeSet;
import com.android.internal.R;
/**
* A PathMotion that generates a curved path along an arc on an imaginary circle containing
* the two points. If the horizontal distance between the points is less than the vertical
@@ -207,7 +207,7 @@ public class ArcMotion extends PathMotion {
ey = (startY + endY) / 2;
} else {
float deltaX = endX - startX;
float deltaY = startY - endY; // Y is inverted compared to diagram above.
float deltaY = endY - startY;
// hypotenuse squared.
float h2 = deltaX * deltaX + deltaY * deltaY;
@@ -219,24 +219,35 @@ public class ArcMotion extends PathMotion {
float midDist2 = h2 * 0.25f;
float minimumArcDist2 = 0;
boolean isQuadrant1Or3 = (deltaX * deltaY) > 0;
if (Math.abs(deltaX) < Math.abs(deltaY)) {
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
// bd = hypotenuse/2
// fb = deltaY
float eDistY = h2 / (2 * deltaY);
ey = endY + eDistY;
ex = endX;
if (isQuadrant1Or3) {
ey = startY + eDistY;
ex = startX;
} else {
ey = endY - eDistY;
ex = endX;
}
minimumArcDist2 = midDist2 * mMinimumVerticalTangent
* mMinimumVerticalTangent;
} else {
// Same as above, but flip X & Y
float eDistX = h2 / (2 * deltaX);
ex = endX + eDistX;
ey = endY;
if (isQuadrant1Or3) {
ex = endX - eDistX;
ey = endY;
} else {
ex = startX + eDistX;
ey = startY;
}
minimumArcDist2 = midDist2 * mMinimumHorizontalTangent
* mMinimumHorizontalTangent;