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

Merge "More transition fixes" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-03-26 00:59:26 +00:00
committed by Android (Google) Code Review
parent 349c866e39 1f458fb6a1
commit 7c73cd02da
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -996,7 +996,14 @@ public class AppTransition implements Dump {
private Path createCurvedPath(float fromX, float toX, float fromY, float toY) { private Path createCurvedPath(float fromX, float toX, float fromY, float toY) {
final Path path = new Path(); final Path path = new Path();
path.moveTo(fromX, fromY); path.moveTo(fromX, fromY);
path.cubicTo(fromX, fromY, toX, 0.9f * fromY + 0.1f * toY, toX, toY);
if (fromY > toY) {
// If the object needs to go up, move it in horizontal direction first, then vertical.
path.cubicTo(fromX, fromY, toX, 0.9f * fromY + 0.1f * toY, toX, toY);
} else {
// If the object needs to go down, move it in vertical direction first, then horizontal.
path.cubicTo(fromX, fromY, fromX, 0.1f * fromY + 0.9f * toY, toX, toY);
}
return path; return path;
} }
@@ -1557,6 +1564,7 @@ public class AppTransition implements Dump {
int getAppStackClipMode() { int getAppStackClipMode() {
return mNextAppTransition == TRANSIT_ACTIVITY_RELAUNCH return mNextAppTransition == TRANSIT_ACTIVITY_RELAUNCH
|| mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS || mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS
|| mNextAppTransitionType == NEXT_TRANSIT_TYPE_CLIP_REVEAL
? STACK_CLIP_NONE ? STACK_CLIP_NONE
: STACK_CLIP_AFTER_ANIM; : STACK_CLIP_AFTER_ANIM;
} }