From b1c36ce938a7a6c948ba5cdd823679d73d974789 Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Wed, 25 Aug 2021 11:54:08 +0100 Subject: [PATCH] Add feature flag to control two panel home in portrait Bug: 197723099 Test: manual Change-Id: I20d7751e09053dc90c495f398334431f390f64bf --- src/com/android/launcher3/DeviceProfile.java | 3 ++- src/com/android/launcher3/config/FeatureFlags.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 3010be1a0e..b7d0481c96 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -248,7 +248,8 @@ public class DeviceProfile { // Tablet UI does not support emulated landscape. isTablet = allowRotation && info.isTablet(windowBounds); isPhone = !isTablet; - isTwoPanels = isTablet && useTwoPanels; + isTwoPanels = isTablet && useTwoPanels + && (isLandscape || FeatureFlags.ENABLE_TWO_PANEL_HOME_IN_PORTRAIT.get()); aspectRatio = ((float) Math.max(widthPx, heightPx)) / Math.min(widthPx, heightPx); boolean isTallDevice = Float.compare(aspectRatio, TALL_DEVICE_ASPECT_RATIO_THRESHOLD) >= 0; diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 38a957ddae..74c7310c2e 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -230,6 +230,10 @@ 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.");