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

Commit 1eecb8ef authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Fix pip fixed-rotation with shell-transitions"

parents b00a7456 1f15fd36

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipAnimationController.java

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ public class PipAnimationController { 
                    setCurrentValue(bounds);

                    final Rect insets = computeInsets(fraction);

                    final float degree, x, y;

                    if (Transitions.ENABLE_SHELL_TRANSITIONS) {

                    if (Transitions.SHELL_TRANSITIONS_ROTATION) {

                        if (rotationDelta == ROTATION_90) {

                            degree = 90 * (1 - fraction);

                            x = fraction * (end.left - start.left)

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ public class Transitions implements RemoteCallable<Transitions> { 
    /** Set to {@code true} to enable shell transitions. */

    public static final boolean ENABLE_SHELL_TRANSITIONS =

            SystemProperties.getBoolean("persist.debug.shell_transit", false);

    public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS

            && SystemProperties.getBoolean("persist.debug.shell_transit_rotate", false);



    /** Transition type for exiting PIP via the Shell, via pressing the expand button. */

    public static final int TRANSIT_EXIT_PIP = TRANSIT_FIRST_CUSTOM + 1;