commit cfafb55331f233de58cd5b3c1c132199023e2a9d
author Andy Wickham <awickham@google.com> Mon Jun 10 15:30:51 2024 -0700
committer Andy Wickham <awickham@google.com> Wed Jun 12 01:24:36 2024 +0000
tree 62418ce3040fb1587575051be6d54aa88162957c
parent 80dbe9ae3e83eac22a2b57ad5b66add38bc45213

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

src/com/android/launcher3/DeviceProfile.java

diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java
index 0daabb1..00db3a3 100644
--- a/src/com/android/launcher3/DeviceProfile.java
+++ b/src/com/android/launcher3/DeviceProfile.java
@@ -53,7 +53,6 @@
 
 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 @@
         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(