Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "move shell_transit sysprop to persist.wm" into tm-dev

Browse Source
This commit is contained in:
Evan Rosky
2022-03-08 19:34:01 +00:00
committed by Android (Google) Code Review
parent 58ba02cc3c cf3d0a65a4
commit 10dc2271c1
8 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/policy/TransitionAnimation.java
View File

@@ -100,7 +100,7 @@ public class TransitionAnimation {
// TODO (b/215515255): remove once we full migrate to shell transitions // TODO (b/215515255): remove once we full migrate to shell transitions
private static final boolean SHELL_TRANSITIONS_ENABLED = 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 Context mContext;
private final String mTag; private final String mTag;

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

@@ -73,9 +73,9 @@ public class Transitions implements RemoteCallable<Transitions> {
/** Set to {@code true} to enable shell transitions. */ /** Set to {@code true} to enable shell transitions. */
public static final boolean 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 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. */ /** Transition type for exiting PIP via the Shell, via pressing the expand button. */
public static final int TRANSIT_EXIT_PIP = TRANSIT_FIRST_CUSTOM + 1; public static final int TRANSIT_EXIT_PIP = TRANSIT_FIRST_CUSTOM + 1;

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

@@ -61,7 +61,7 @@ abstract class BaseAppHelper(
private const val APP_CLOSE_WAIT_TIME_MS = 3_000L private const val APP_CLOSE_WAIT_TIME_MS = 3_000L
fun isShellTransitionsEnabled() = fun isShellTransitionsEnabled() =
SystemProperties.getBoolean("persist.debug.shell_transit", false) SystemProperties.getBoolean("persist.wm.debug.shell_transit", false)
fun executeShellCommand(instrumentation: Instrumentation, cmd: String) { fun executeShellCommand(instrumentation: Instrumentation, cmd: String) {
try { try {

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

@@ -50,7 +50,7 @@ import java.util.Optional;
@SmallTest @SmallTest
public class FullscreenTaskListenerTest { public class FullscreenTaskListenerTest {
private static final boolean ENABLE_SHELL_TRANSITIONS = private static final boolean ENABLE_SHELL_TRANSITIONS =
SystemProperties.getBoolean("persist.debug.shell_transit", false); SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
@Mock @Mock
private SyncTransactionQueue mSyncQueue; private SyncTransactionQueue mSyncQueue;

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

@@ -62,7 +62,7 @@ import org.mockito.MockitoAnnotations;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public final class StageTaskListenerTests extends ShellTestCase { public final class StageTaskListenerTests extends ShellTestCase {
private static final boolean ENABLE_SHELL_TRANSITIONS = private static final boolean ENABLE_SHELL_TRANSITIONS =
SystemProperties.getBoolean("persist.debug.shell_transit", false); SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
@Mock @Mock
private ShellTaskOrganizer mTaskOrganizer; private ShellTaskOrganizer mTaskOrganizer;

2
packages/SystemUI/src/com/android/systemui/flags/Flags.java
View File

@@ -155,7 +155,7 @@ public class Flags {
// 1100 - windowing // 1100 - windowing
public static final SysPropBooleanFlag WM_ENABLE_SHELL_TRANSITIONS = 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. // Pay no attention to the reflection behind the curtain.
// ========================== Curtain ========================== // ========================== Curtain ==========================

2
services/core/java/com/android/server/wm/TransitionController.java
View File

@@ -61,7 +61,7 @@ class TransitionController {
/** Whether to use shell-transitions rotation instead of fixed-rotation. */ /** Whether to use shell-transitions rotation instead of fixed-rotation. */
private static final boolean SHELL_TRANSITIONS_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. */ /** The same as legacy APP_TRANSITION_TIMEOUT_MS. */
private static final int DEFAULT_TIMEOUT_MS = 5000; private static final int DEFAULT_TIMEOUT_MS = 5000;

2
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -406,7 +406,7 @@ public class WindowManagerService extends IWindowManager.Stub
/** /**
* Use WMShell for app transition. * 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 * @see #ENABLE_SHELL_TRANSITIONS