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

2017-07-17 20:48:45 +00:00
parent 6967552065 0bf251b643
commit b49ff69b91
2 changed files with 2 additions and 2 deletions
@@ -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);