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