commit 1d2abb366d851c3272b45de061843bb643fdab36
author Evan Rosky <erosky@google.com> Wed Jan 25 00:08:16 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 25 00:08:16 2023 +0000
tree 350bf7f4a1a2835b21bf00c2b430c3ad36f64af6
parent 1b3d1cfa644c4f9cef3c6cf36e9d3f525cd837de
parent e0cfbc3475b0ea42c25e301cffaec3a0a405083d

Merge "Revert^8 "Enable Shell Transitions""

quickstep/src/com/android/quickstep/TaskAnimationManager.java

diff --git a/quickstep/src/com/android/quickstep/TaskAnimationManager.java b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
index c45b2f0..0e5aa81 100644
--- a/quickstep/src/com/android/quickstep/TaskAnimationManager.java
+++ b/quickstep/src/com/android/quickstep/TaskAnimationManager.java
@@ -50,7 +50,7 @@
 
 public class TaskAnimationManager implements RecentsAnimationCallbacks.RecentsAnimationListener {
     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);
 

quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java

diff --git a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
index 2c5825f..59f9d5f 100644
--- a/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
+++ b/quickstep/tests/src/com/android/quickstep/AbstractQuickStepTest.java
@@ -34,7 +34,7 @@
  */
 public abstract class AbstractQuickStepTest extends AbstractLauncherUiTest {
     public static final boolean ENABLE_SHELL_TRANSITIONS =
-            SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
+            SystemProperties.getBoolean("persist.wm.debug.shell_transit", true);
     @Override
     protected TestRule getRulesInsideActivityMonitor() {
         return RuleChain.