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

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

Merge "Revert^2 "Enable Shell Transitions""

parents a541e9a0 37ebac3d

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class SplitController implements JetpackTaskFragmentOrganizer.TaskFragmen 
        ActivityEmbeddingComponent {

    static final String TAG = "SplitController";

    static final boolean ENABLE_SHELL_TRANSITIONS =

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

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



    @VisibleForTesting

    @GuardedBy("mLock")

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

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class Transitions implements RemoteCallable<Transitions> { 


    /** Set to {@code true} to enable shell transitions. */

    public static final boolean ENABLE_SHELL_TRANSITIONS =

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

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

    public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS

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

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

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

public final class StageTaskListenerTests extends ShellTestCase {

    private static final boolean ENABLE_SHELL_TRANSITIONS =

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

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



    @Mock

    private ShellTaskOrganizer mTaskOrganizer;

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ object Flags { 
    @Keep

    @JvmField

    val WM_ENABLE_SHELL_TRANSITIONS =

        SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", false)

        SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", true)



    // TODO(b/254513207): Tracking Bug

    @Keep

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

+1 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ public class WindowManagerService extends IWindowManager.Stub 
     * @see #ENABLE_SHELL_TRANSITIONS

     */

    public static final boolean sEnableShellTransitions =

            SystemProperties.getBoolean(ENABLE_SHELL_TRANSITIONS, false);

            SystemProperties.getBoolean(ENABLE_SHELL_TRANSITIONS, true);



    /**

     * Allows a fullscreen windowing mode activity to launch in its desired orientation directly