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

Commit 36e2ae4c authored by Andy Wickham's avatar Andy Wickham Committed by Android (Google) Code Review
Browse files

Merge "Adds additional top padding in All Apps with floating searchbar." into tm-qpr-dev

parents 49d07b16 9cdba2f3

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
    <dimen name="all_apps_tabs_indicator_height">2dp</dimen>

    <dimen name="all_apps_header_top_margin">33dp</dimen>

    <dimen name="all_apps_header_top_padding">36dp</dimen>

    <!-- Additional top padding to add when Floating Searchbar is enabled. -->

    <dimen name="all_apps_additional_top_padding_floating_search">16dp</dimen>

    <dimen name="all_apps_header_bottom_padding">14dp</dimen>

    <dimen name="all_apps_header_top_adjustment">6dp</dimen>

    <dimen name="all_apps_header_bottom_adjustment">4dp</dimen>

src/com/android/launcher3/allapps/BaseAllAppsContainerView.java

+7 −3
Original line number Diff line number Diff line
@@ -508,8 +508,12 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 
        if (grid.isVerticalBarLayout()) {

            setPadding(grid.workspacePadding.left, 0, grid.workspacePadding.right, 0);

        } else {

            setPadding(grid.allAppsLeftRightMargin, grid.allAppsTopPadding,

                    grid.allAppsLeftRightMargin, 0);

            int topPadding = grid.allAppsTopPadding;

            if (FeatureFlags.ENABLE_FLOATING_SEARCH_BAR.get() && !grid.isTablet) {

                topPadding += getResources().getDimensionPixelSize(

                        R.dimen.all_apps_additional_top_padding_floating_search);

            }

            setPadding(grid.allAppsLeftRightMargin, topPadding, grid.allAppsLeftRightMargin, 0);

        }



        InsettableFrameLayout.dispatchInsets(this, insets);
@@ -824,7 +828,7 @@ public abstract class BaseAllAppsContainerView<T extends Context & ActivityConte 
        if (mHeaderPaint.getColor() == mScrimColor || mHeaderPaint.getColor() == 0) {

            return;

        }

        int bottom = getHeaderBottom();

        int bottom = getHeaderBottom() + getVisibleContainerView().getPaddingTop();

        FloatingHeaderView headerView = getFloatingHeaderView();

        if (isTablet) {

            // Start adding header protection if search bar or tabs will attach to the top.