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

Commit b49ff69b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Accounting for bottom margin in the search box in app-scroll range"... 

Merge "Accounting for bottom margin in the search box in app-scroll range" into ub-launcher3-dorval-polish
parents 69675520 0bf251b6

res/values-sw720dp/dimens.xml

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
<resources>

    <!-- All Apps -->

    <dimen name="all_apps_button_scale_down">8dp</dimen>

    <dimen name="all_apps_search_bar_height">54dp</dimen>

    <dimen name="all_apps_empty_search_message_top_offset">64dp</dimen>

    <dimen name="all_apps_empty_search_bg_top_offset">180dp</dimen>

src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ public class AppsSearchContainerLayout extends FrameLayout 
                if (!dp.isVerticalBarLayout()) {

                    Rect insets = mLauncher.getDragLayer().getInsets();

                    int hotseatBottom = bottom - dp.hotseatBarBottomPaddingPx - insets.bottom;

                    int searchTopMargin = insets.top + (mMinHeight - mSearchBoxHeight);

                    int searchTopMargin = insets.top + (mMinHeight - mSearchBoxHeight)

                            + ((MarginLayoutParams) getLayoutParams()).bottomMargin;

                    listener.onScrollRangeChanged(hotseatBottom - searchTopMargin);

                } else {

                    listener.onScrollRangeChanged(bottom);