From cf3d0a65a46922002fb9baf978b359c8d109ef6e Mon Sep 17 00:00:00 2001 From: Evan Rosky Date: Wed, 2 Mar 2022 15:42:15 -0800 Subject: [PATCH] move shell_transit sysprop to persist.wm This way we can use a context that systemui can set via flipper Bug: 219067621 Test: manual Change-Id: I29d1c39a1733e4d5f19f7f025e8a2cf2ca4f6d5a --- .../java/com/android/internal/policy/TransitionAnimation.java | 2 +- .../src/com/android/wm/shell/transition/Transitions.java | 4 ++-- .../src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt | 2 +- .../wm/shell/fullscreen/FullscreenTaskListenerTest.java | 2 +- .../android/wm/shell/splitscreen/StageTaskListenerTests.java | 2 +- packages/SystemUI/src/com/android/systemui/flags/Flags.java | 2 +- .../core/java/com/android/server/wm/TransitionController.java | 2 +- .../core/java/com/android/server/wm/WindowManagerService.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/java/com/android/internal/policy/TransitionAnimation.java b/core/java/com/android/internal/policy/TransitionAnimation.java index 37c96e71a0a8d..03adb3434ea89 100644 --- a/core/java/com/android/internal/policy/TransitionAnimation.java +++ b/core/java/com/android/internal/policy/TransitionAnimation.java @@ -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; 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 efb52a5b4644c..fa1258930b788 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 @@ -73,9 +73,9 @@ public class Transitions implements RemoteCallable { /** 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; diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt index 57bc0d580d725..3dd9e05729477 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/BaseAppHelper.kt @@ -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 { diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java index 46fe201072c9a..4523e2c9cba58 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/fullscreen/FullscreenTaskListenerTest.java @@ -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; 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 13b726efb0464..157c30bcb6c7a 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 @@ -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; diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.java b/packages/SystemUI/src/com/android/systemui/flags/Flags.java index bf689e30d2fd6..b590412dd48c8 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.java +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.java @@ -155,7 +155,7 @@ public class Flags { // 1100 - windowing public static final SysPropBooleanFlag WM_ENABLE_SHELL_TRANSITIONS = - new SysPropBooleanFlag(1100, "persist.debug.shell_transit", false); + new SysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", false); // Pay no attention to the reflection behind the curtain. // ========================== Curtain ========================== diff --git a/services/core/java/com/android/server/wm/TransitionController.java b/services/core/java/com/android/server/wm/TransitionController.java index 0436233925467..8840cd557de69 100644 --- a/services/core/java/com/android/server/wm/TransitionController.java +++ b/services/core/java/com/android/server/wm/TransitionController.java @@ -61,7 +61,7 @@ class TransitionController { /** Whether to use shell-transitions rotation instead of fixed-rotation. */ private static final boolean SHELL_TRANSITIONS_ROTATION = - SystemProperties.getBoolean("persist.debug.shell_transit_rotate", false); + SystemProperties.getBoolean("persist.wm.debug.shell_transit_rotate", false); /** The same as legacy APP_TRANSITION_TIMEOUT_MS. */ private static final int DEFAULT_TIMEOUT_MS = 5000; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 03e21405ff03e..cdd54636895cc 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -403,7 +403,7 @@ public class WindowManagerService extends IWindowManager.Stub /** * Use WMShell for app transition. */ - public static final String ENABLE_SHELL_TRANSITIONS = "persist.debug.shell_transit"; + public static final String ENABLE_SHELL_TRANSITIONS = "persist.wm.debug.shell_transit"; /** * @see #ENABLE_SHELL_TRANSITIONS