Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f458fb6 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

More transition fixes 

- Set correct clip mode for clip reveal animation
- When moving downwards on a curved path, go down first and then
horizontal.

Bug: 27154882
Bug: 27607141
Bug: 26559810
Change-Id: I0efc073990f7b6a88746ca1e5c68b1fdb0db116d
parent 09072000

services/core/java/com/android/server/wm/AppTransition.java

+9 −1
Original line number Diff line number Diff line
@@ -996,7 +996,14 @@ public class AppTransition implements Dump { 
    private Path createCurvedPath(float fromX, float toX, float fromY, float toY) {

        final Path path = new Path();

        path.moveTo(fromX, fromY);



        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;

    }
@@ -1557,6 +1564,7 @@ public class AppTransition implements Dump { 
    int getAppStackClipMode() {

        return mNextAppTransition == TRANSIT_ACTIVITY_RELAUNCH

                || mNextAppTransition == TRANSIT_DOCK_TASK_FROM_RECENTS

                || mNextAppTransitionType == NEXT_TRANSIT_TYPE_CLIP_REVEAL

                ? STACK_CLIP_NONE

                : STACK_CLIP_AFTER_ANIM;

    }