From cfafb55331f233de58cd5b3c1c132199023e2a9d Mon Sep 17 00:00:00 2001 From: Andy Wickham Date: Mon, 10 Jun 2024 15:30:51 -0700 Subject: [PATCH] Convert ENABLE_FLOATING_SEARCH_BAR to aconfig. Flag: com.android.launcher3.floating_search_bar Test: Build (existing code unchanged) Bug: 346408388 Fix: 346406981 Change-Id: Ia8d15ceb1b2b4754657844d602cb95b9555a4ece --- aconfig/launcher.aconfig | 7 +++++++ src/com/android/launcher3/DeviceProfile.java | 3 +-- src/com/android/launcher3/config/FeatureFlags.java | 5 ----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/aconfig/launcher.aconfig b/aconfig/launcher.aconfig index fecc43d0b2..9c945b9b35 100644 --- a/aconfig/launcher.aconfig +++ b/aconfig/launcher.aconfig @@ -302,3 +302,10 @@ flag { purpose: PURPOSE_BUGFIX } } + +flag { + name: "floating_search_bar" + namespace: "launcher" + description: "Search bar persists at the bottom of the screen across Launcher states" + bug: "346408388" +} diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 0daabb1451..00db3a3886 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -53,7 +53,6 @@ import androidx.core.content.res.ResourcesCompat; import com.android.launcher3.CellLayout.ContainerType; import com.android.launcher3.DevicePaddings.DevicePadding; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.icons.DotRenderer; import com.android.launcher3.icons.IconNormalizer; import com.android.launcher3.model.data.ItemInfo; @@ -714,7 +713,7 @@ public class DeviceProfile { overviewTaskThumbnailTopMarginPx = enableOverviewIconMenu() ? 0 : overviewTaskIconSizePx + overviewTaskMarginPx; // Don't add margin with floating search bar to minimize risk of overlapping. - overviewActionsTopMarginPx = FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get() ? 0 + overviewActionsTopMarginPx = Flags.floatingSearchBar() ? 0 : res.getDimensionPixelSize(R.dimen.overview_actions_top_margin); overviewPageSpacing = res.getDimensionPixelSize(R.dimen.overview_page_spacing); overviewActionsButtonSpacing = res.getDimensionPixelSize( diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java index 4b908bfb12..33e6f9106f 100644 --- a/src/com/android/launcher3/config/FeatureFlags.java +++ b/src/com/android/launcher3/config/FeatureFlags.java @@ -84,11 +84,6 @@ public final class FeatureFlags { + "data preparation for loading the home screen"); // TODO(Block 4): Cleanup flags - public static final BooleanFlag ENABLE_FLOATING_SEARCH_BAR = - getReleaseFlag(268388460, "ENABLE_FLOATING_SEARCH_BAR", DISABLED, - "Allow search bar to persist and animate across states, and attach to" - + " the keyboard from the bottom of the screen"); - public static final BooleanFlag ENABLE_ALL_APPS_FROM_OVERVIEW = getDebugFlag(275132633, "ENABLE_ALL_APPS_FROM_OVERVIEW", DISABLED, "Allow entering All Apps from Overview (e.g. long swipe up from app)");