Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e1b2594 authored by Curtis Belmonte's avatar Curtis Belmonte
Browse files

Revert "Turn on the transition flag" 

This reverts commit 1be773da.

Reason for revert: b/187517936

Fixes: 187517936
Change-Id: I57d0a7a16bdb76e105b0febd43bdf81521e69e3a
parent 1be773da

src/com/android/settings/Utils.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class SettingsHomepageActivityTest { 
    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

        ShadowUtils.setIsPageTransitionEnabled(true);

        ShadowUtils.setIsPageTransitionEnabled(false);

    }



    @Test