diff options
| author | 2022-10-12 20:53:11 +0000 | |
|---|---|---|
| committer | 2022-10-12 20:57:37 +0000 | |
| commit | 884718c5294e2a64652c8a8ce6790bd11d5347e8 (patch) | |
| tree | 2476ffd38207933a738eacb39f2363553d65de47 | |
| parent | 60669eda27a4bddb1e89271a889d83aa34744f9f (diff) | |
Revert "Enable Shell Transitions"
Revert "Enable Shell Transitions"
Revert submission 19199517-enable_shell_transit
Reason for revert: DroidMonitor-triggered revert due to breakage, bug b/253049434 b/253109117 b/253181889 b/253271977
Reverted Changes:
I85f9565b3:Enable Shell Transitions
I75d0fe964:Enable Shell Transitions
I0565e423a:Enable Shell Transitions
I98bf8f0aa:Enable Shell Transitions
Change-Id: Ib259a6f232c04c9c30079297370e1ecb31aea74b
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 967e74851ff2..6af3d2bf4915 100644 --- a/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java +++ b/libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/SplitController.java @@ -86,7 +86,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 5f87447d70be..d2e8624171f6 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 @@ -77,7 +77,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", 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 1a1bebd28aef..5ee8bf3006a3 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.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index 640fced97309..78099d1fd12f 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -205,7 +205,7 @@ public class Flags { // 1100 - windowing @Keep public static final SysPropBooleanFlag WM_ENABLE_SHELL_TRANSITIONS = - new SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", true); + new SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", false); /** * b/170163464: animate bubbles expanded view collapse with home gesture diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 07424cb8f7f4..5ad6fbd69d7e 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -419,7 +419,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 |