commit 1e1b2594457f6f39fd080132f442440dc1926288
author Curtis Belmonte <curtislb@google.com> Fri May 07 22:42:35 2021 +0000
committer Curtis Belmonte <curtislb@google.com> Fri May 07 22:43:05 2021 +0000
tree ef490a641ed1514bc58561d2088b524606706af5
parent 1be773da62202726ce433a7abaffe05a8a231bf4

Revert "Turn on the transition flag"

This reverts commit 1be773da62202726ce433a7abaffe05a8a231bf4.

Reason for revert: b/187517936

Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6895fbb..fd67aa8 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1205,7 +1205,7 @@
     public static boolean isPageTransitionEnabled(Context context) {
         final boolean isSilkyHome = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME);
         final boolean isTransitionEnabled = Settings.Global.getInt(context.getContentResolver(),
-                SETTINGS_SHARED_AXIS_ENABLED, 1) == 1;
+                SETTINGS_SHARED_AXIS_ENABLED, 0) == 1;
 
         return isSilkyHome && isTransitionEnabled;
     }

tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java

diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 0554749..620f6d7 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -65,7 +65,7 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowUtils.setIsPageTransitionEnabled(true);
+        ShadowUtils.setIsPageTransitionEnabled(false);
     }
 
     @Test