commit f376613a5b17f4af58c0c31b3c8cb910fafa02c6
author Sebastian Franco <fransebas@google.com> Thu Sep 07 14:50:07 2023 -0700
committer Sebastián Franco <fransebas@google.com> Tue Sep 12 18:19:53 2023 +0000
tree 1f6260057a80359db29a8a7bbd16b863fce256f2
parent 7c183e29870dd9480423641e35ae3e59250b0857

Disable FOLDABLE_SINGLE_PAGE

ENABLE_TWO_PANEL_HOME is no longer used so I will also
remove it.

TwoPanelWorkspaceTest was expecting an icon on the hotseat
which no longer exist.

We will use the new flag system in main for this
feature.

Test: atest ReorderWidgets
Test: atest FoldableIntegrity
Bug: 270395274
Change-Id: I122a924a81ae989ff5636d8e276d6d31bbe0877d

src/com/android/launcher3/InvariantDeviceProfile.java

diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java
index e3de79e..c619bc5 100644
--- a/src/com/android/launcher3/InvariantDeviceProfile.java
+++ b/src/com/android/launcher3/InvariantDeviceProfile.java
@@ -18,7 +18,6 @@
 
 import static com.android.launcher3.LauncherPrefs.GRID_NAME;
 import static com.android.launcher3.Utilities.dpiFromPx;
-import static com.android.launcher3.config.FeatureFlags.ENABLE_TWO_PANEL_HOME;
 import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;
 import static com.android.launcher3.util.DisplayController.CHANGE_DENSITY;
 import static com.android.launcher3.util.DisplayController.CHANGE_NAVIGATION_MODE;
@@ -316,7 +315,7 @@
         int type = displayInfo.supportedBounds.stream()
                 .mapToInt(bounds -> displayInfo.isTablet(bounds) ? flagTablet : flagPhone)
                 .reduce(0, (a, b) -> a | b);
-        if ((type == (flagPhone | flagTablet)) && ENABLE_TWO_PANEL_HOME.get()) {
+        if (type == (flagPhone | flagTablet)) {
             // device has profiles supporting both phone and table modes
             return TYPE_MULTI_DISPLAY;
         } else if (type == flagTablet) {