From 9012582ef78eda3cb03db193f81ab9497d9011dc Mon Sep 17 00:00:00 2001 From: Alex Chau Date: Wed, 17 Nov 2021 14:16:58 +0000 Subject: [PATCH] Revert "Add feature flag to control two panel home in portrait" This reverts commit b1c36ce938a7a6c948ba5cdd823679d73d974789. Reason for revert: experiment no longer requried Bug: 197723099 Change-Id: I585fa4364ab5326a19b099a80a1a02a66370d84f --- src/com/android/launcher3/DeviceProfile.java | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index b7d0481c96..3010be1a0e 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -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; diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 74c7310c2e..38a957ddae 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -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.");