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

Commit ac1b7661 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Turn on the transition flag" into sc-dev

parents c37abc9e 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, 0) == 1;

                SETTINGS_SHARED_AXIS_ENABLED, 1) == 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(false);

        ShadowUtils.setIsPageTransitionEnabled(true);

    }



    @Test