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

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

Merge "Switch to persist.wm.debug" into tm-dev

parents a9583776 01bbf1a8

quickstep/src/com/android/quickstep/TaskAnimationManager.java

+2 −2
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ import java.util.HashMap; 


public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {

    public static final boolean ENABLE_SHELL_TRANSITIONS =

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

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

    public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS

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

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



    private RecentsAnimationController mController;

    private RecentsAnimationCallbacks mCallbacks;

quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import org.junit.rules.TestRule; 
 */

public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {

    static final boolean ENABLE_SHELL_TRANSITIONS =

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

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

    @Override

    protected TestRule getRulesInsideActivityMonitor() {

        return RuleChain.