commit 1be773da62202726ce433a7abaffe05a8a231bf4
author Yi-Ling Chuang <emilychuang@google.com> Fri May 07 12:07:45 2021 +0800
committer Yi-Ling Chuang <emilychuang@google.com> Fri May 07 13:21:42 2021 +0800
tree 47982dbcb0e9006dcb9c72e09b3b7963ca1826b1
parent 8642ee35ad718dad69d7e22a249448ae419324bc

Turn on the transition flag

Test: robotests
Bug: 186701900
Change-Id: I09c821e17fca88ee532f6535031a52c4c832a1e8

src/com/android/settings/Utils.java

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index fd67aa8..6895fbb 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, 0) == 1;
+                SETTINGS_SHARED_AXIS_ENABLED, 1) == 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 620f6d7..0554749 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(false);
+        ShadowUtils.setIsPageTransitionEnabled(true);
     }
 
     @Test