Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a281ff7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Convert ENABLE_FLOATING_SEARCH_BAR to aconfig." into main

parents 6e02de9c cfafb553

aconfig/launcher.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -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"

}

src/com/android/launcher3/DeviceProfile.java

+1 −2
Original line number Diff line number Diff line
@@ -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(

src/com/android/launcher3/config/FeatureFlags.java

+0 −5
Original line number Diff line number Diff line
@@ -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)");