commit 0bf251b6433f8c463162d233031dfd03b5586ab0
author Sunny Goyal <sunnygoyal@google.com> Fri Jul 14 03:46:23 2017 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Jul 17 12:55:06 2017 -0700
tree 3287bfe1b371f6e35a9a4b82e8dbb9f0554f07c5
parent 28032006970703240f4abd34429608abd2358645

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

Bug: 2539098
Change-Id: I9d7cdb05d33af397a4adcfc2f1f6c1d380b9fb0e

res/values-sw720dp/dimens.xml

diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index e836d7d..b211207 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -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

diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 5cb12d5..39e2088 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -202,7 +202,8 @@
                 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);