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

Merge "Revert^4 "Enable Shell Transitions""

Browse Source
This commit is contained in:
Evan Rosky
2022-11-11 23:31:28 +00:00
committed by Android (Google) Code Review
parent b49bde447f cc23c1824d
commit d13c6637cc
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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")

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

@@ -80,7 +80,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);

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

@@ -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;

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

@@ -301,7 +301,7 @@ object Flags {
@Keep
@JvmField
val WM_ENABLE_SHELL_TRANSITIONS =
sysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", default = false)
sysPropBooleanFlag(1100, "persist.wm.debug.shell_transit", default = true)
// TODO(b/254513207): Tracking Bug
@Keep

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

@@ -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