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

Commit 9012582e authored by Alex Chau's avatar Alex Chau
Browse files

Revert "Add feature flag to control two panel home in portrait" 

This reverts commit b1c36ce9.

Reason for revert: experiment no longer requried
Bug: 197723099

Change-Id: I585fa4364ab5326a19b099a80a1a02a66370d84f
parent b1c36ce9

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -248,8 +248,7 @@ public class DeviceProfile { 
        // Tablet UI does not support emulated landscape.

        isTablet = allowRotation && info.isTablet(windowBounds);

        isPhone = !isTablet;

        isTwoPanels = isTablet && useTwoPanels

                && (isLandscape || FeatureFlags.ENABLE_TWO_PANEL_HOME_IN_PORTRAIT.get());

        isTwoPanels = isTablet && useTwoPanels;



        aspectRatio = ((float) Math.max(widthPx, heightPx)) / Math.min(widthPx, heightPx);

        boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0;

src/com/android/launcher3/config/FeatureFlags.java

+0 −4
Original line number Diff line number Diff line
@@ -230,10 +230,6 @@ public final class FeatureFlags { 
            "ENABLE_TWO_PANEL_HOME", true,

            "Uses two panel on home screen. Only applicable on large screen devices.");



    public static final BooleanFlag ENABLE_TWO_PANEL_HOME_IN_PORTRAIT = getDebugFlag(

            "ENABLE_TWO_PANEL_HOME_IN_PORTRAIT", true,

            "Uses two panel on home screen in portrait if ENABLE_TWO_PANEL_HOME is enabled.");



    public static final BooleanFlag ENABLE_SCRIM_FOR_APP_LAUNCH = getDebugFlag(

            "ENABLE_SCRIM_FOR_APP_LAUNCH", false,

            "Enables scrim during app launch animation.");