From 324b67420947e21072421716b5cfa8db0b544521 Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Mon, 7 Nov 2022 22:06:52 +0000 Subject: [PATCH] Revert^3 "Enable Shell Transitions" 37ebac3d4a753952bcdd147e0c81b7d631b1bee2 Change-Id: Iae588a3579568f2f554cfb66bc243f972fa2ea37 --- .../androidx/window/extensions/embedding/SplitController.java | 2 +- .../Shell/src/com/android/wm/shell/transition/Transitions.java | 2 +- .../android/wm/shell/splitscreen/StageTaskListenerTests.java | 2 +- packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 2 +- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java index a74bc6af507fb..bf7326a5b30e9 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -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", true); + SystemProperties.getBoolean("persist.wm.debug.shell_transit", false); @VisibleForTesting @GuardedBy("mLock") diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java index 3e7ead3bed9ce..394d6f6bf731a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java @@ -81,7 +81,7 @@ public class Transitions implements RemoteCallable { /** Set to {@code true} to enable shell transitions. */ public static final boolean ENABLE_SHELL_TRANSITIONS = - SystemProperties.getBoolean("persist.wm.debug.shell_transit", true); + SystemProperties.getBoolean("persist.wm.debug.shell_transit", false); public static final boolean SHELL_TRANSITIONS_ROTATION = ENABLE_SHELL_TRANSITIONS && SystemProperties.getBoolean("persist.wm.debug.shell_transit_rotate", false); diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java index 1a1bebd28aef1..5ee8bf3006a30 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageTaskListenerTests.java @@ -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", true); + SystemProperties.getBoolean("persist.wm.debug.shell_transit", false); @Mock private ShellTaskOrganizer mTaskOrganizer; diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 2d7e14078b52f..3e7e6ccb89009 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -238,7 +238,7 @@ object Flags { // 1100 - windowing @Keep val WM_ENABLE_SHELL_TRANSITIONS = - SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", true) + SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", false) /** b/170163464: animate bubbles expanded view collapse with home gesture */ @Keep diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 8da6caa806a1d..c9d3dac104de8 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -424,7 +424,7 @@ public class WindowManagerService extends IWindowManager.Stub * @see #ENABLE_SHELL_TRANSITIONS */ public static final boolean sEnableShellTransitions = - SystemProperties.getBoolean(ENABLE_SHELL_TRANSITIONS, true); + SystemProperties.getBoolean(ENABLE_SHELL_TRANSITIONS, false); /** * Allows a fullscreen windowing mode activity to launch in its desired orientation directly