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

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

Merge "Revert "Add feature flag to control two panel home in portrait"" into sc-v2-dev

parents b797ca77 9012582e

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -251,8 +251,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
@@ -210,10 +210,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.");