diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index ae70f440cd..d57165af87 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -172,6 +172,10 @@ public final class FeatureFlags { "LARGE_SCREEN_WIDGET_PICKER", ENABLED, "Enable new widget picker that takes " + "advantage of large screen format"); + public static final BooleanFlag UNFOLDED_WIDGET_PICKER = getDebugFlag(301918659, + "UNFOLDED_WIDGET_PICKER", DISABLED, "Enable new widget picker that takes " + + "advantage of the unfolded foldable format"); + public static final BooleanFlag MULTI_SELECT_EDIT_MODE = getDebugFlag(270709220, "MULTI_SELECT_EDIT_MODE", DISABLED, "Enable new multi-select edit mode " + "for home screen"); diff --git a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java index a4b605cccd..4105a9adc2 100644 --- a/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java +++ b/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java @@ -60,6 +60,7 @@ import com.android.launcher3.R; import com.android.launcher3.Utilities; import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.compat.AccessibilityManagerCompat; +import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.model.UserManagerState; import com.android.launcher3.model.WidgetItem; import com.android.launcher3.pm.UserCache; @@ -681,7 +682,8 @@ public class WidgetsFullSheet extends BaseWidgetSheet boolean isTwoPane = LARGE_SCREEN_WIDGET_PICKER.get() && launcher.getDeviceProfile().isTablet && launcher.getDeviceProfile().isLandscape - && !launcher.getDeviceProfile().isTwoPanels; + && (!launcher.getDeviceProfile().isTwoPanels + || FeatureFlags.UNFOLDED_WIDGET_PICKER.get()); WidgetsFullSheet sheet; if (isTwoPane) {