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

Commit c9af5265 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "move shell_transit sysprop to persist.wm" into tm-dev am: 10dc2271 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17060214

Change-Id: Ic67652993ed9d3f3aec948adbcf5aa1518167537
parents ccb54dbb 10dc2271

core/java/com/android/internal/policy/TransitionAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class TransitionAnimation { 


    // TODO (b/215515255): remove once we full migrate to shell transitions

    private static final boolean SHELL_TRANSITIONS_ENABLED =

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

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



    private final Context mContext;

    private final String mTag;

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

+2 −2
Original line number Diff line number Diff line
@@ -73,9 +73,9 @@ 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);

            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);



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

    public static final int TRANSIT_EXIT_PIP = TRANSIT_FIRST_CUSTOM + 1;

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ abstract class BaseAppHelper( 
        private const val APP_CLOSE_WAIT_TIME_MS = 3_000L



        fun isShellTransitionsEnabled() =

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

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



        fun executeShellCommand(instrumentation: Instrumentation, cmd: String) {

            try {

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ import java.util.Optional; 
@SmallTest

public class FullscreenTaskListenerTest {

    private static final boolean ENABLE_SHELL_TRANSITIONS =

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

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



    @Mock

    private SyncTransactionQueue mSyncQueue;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ import org.mockito.MockitoAnnotations; 
@RunWith(AndroidJUnit4.class)

public final class StageTaskListenerTests extends ShellTestCase {

    private static final boolean ENABLE_SHELL_TRANSITIONS =

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

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



    @Mock

    private ShellTaskOrganizer mTaskOrganizer;