From 1e1b2594457f6f39fd080132f442440dc1926288 Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Fri, 7 May 2021 22:42:35 +0000
Subject: [PATCH] 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                             | 2 +-
 .../android/settings/homepage/SettingsHomepageActivityTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 6895fbb9c3f..fd67aa813b7 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -1205,7 +1205,7 @@ public final class Utils extends com.android.settingslib.Utils {
     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;
     }
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index 05547496b2a..620f6d74b17 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 @@ public class SettingsHomepageActivityTest {
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowUtils.setIsPageTransitionEnabled(true);
+        ShadowUtils.setIsPageTransitionEnabled(false);
     }
 
     @Test