From f376613a5b17f4af58c0c31b3c8cb910fafa02c6 Mon Sep 17 00:00:00 2001 From: Sebastian Franco Date: Thu, 7 Sep 2023 14:50:07 -0700 Subject: [PATCH] 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 | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 10 +--------- .../launcher3/ui/workspace/TwoPanelWorkspaceTest.java | 5 +++-- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/com/android/launcher3/InvariantDeviceProfile.java b/src/com/android/launcher3/InvariantDeviceProfile.java index e3de79e03a..c619bc58de 100644 --- a/src/com/android/launcher3/InvariantDeviceProfile.java +++ b/src/com/android/launcher3/InvariantDeviceProfile.java @@ -18,7 +18,6 @@ package com.android.launcher3; 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 @@ public class InvariantDeviceProfile { 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) { diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 38aa387f87..6d261e958d 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -183,16 +183,8 @@ public final class FeatureFlags { "Enables predictive back animation from all apps and widgets to home"); // TODO(Block 11): Clean up flags - public static final BooleanFlag ENABLE_TWO_PANEL_HOME = getDebugFlag(270392643, - "ENABLE_TWO_PANEL_HOME", ENABLED, - "Uses two panel on home screen. Only applicable on large screen devices."); - - public static final BooleanFlag FOLDABLE_WORKSPACE_REORDER = getDebugFlag(270395070, - "FOLDABLE_WORKSPACE_REORDER", DISABLED, - "In foldables, when reordering the icons and widgets, is now going to use both sides"); - public static final BooleanFlag FOLDABLE_SINGLE_PAGE = getDebugFlag(270395274, - "FOLDABLE_SINGLE_PAGE", ENABLED, "Use a single page for the workspace"); + "FOLDABLE_SINGLE_PAGE", DISABLED, "Use a single page for the workspace"); public static final BooleanFlag ENABLE_PARAMETRIZE_REORDER = getDebugFlag(289420844, "ENABLE_PARAMETRIZE_REORDER", DISABLED, diff --git a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java b/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java index 0b2f33530d..62a8179a9d 100644 --- a/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java +++ b/tests/src/com/android/launcher3/ui/workspace/TwoPanelWorkspaceTest.java @@ -178,14 +178,15 @@ public class TwoPanelWorkspaceTest extends AbstractLauncherUiTest { public void testDragIconToPage3() { Workspace workspace = mLauncher.getWorkspace(); - workspace.dragIcon(workspace.getHotseatAppIcon("Phone"), 3); + // b/299522368 sometimes the phone app is not present in the hotseat. + workspace.dragIcon(workspace.getHotseatAppIcon("Chrome"), 3); executeOnLauncher(launcher -> { assertPagesExist(launcher, 0, 1, 2, 3); assertItemsOnPage(launcher, 0, "Play Store", "Maps"); assertPageEmpty(launcher, 1); assertPageEmpty(launcher, 2); - assertItemsOnPage(launcher, 3, "Phone"); + assertItemsOnPage(launcher, 3, "Chrome"); }); }