summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/allapps
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-07-17 19:55:26 +0000
committerSunny Goyal <sunnygoyal@google.com>2017-07-17 19:55:26 +0000
commit6cd0e46a8ee384a5255b6189cd46ed694fcbecac (patch)
tree2f034a9b1c29e3c18e8f36decb6277b4a8b75eed /src/com/android/launcher3/allapps
parent030387e517c5f28d82ad5282e3c19e31b8afb370 (diff)
parent0bf251b6433f8c463162d233031dfd03b5586ab0 (diff)
downloadandroid_packages_apps_Trebuchet-6cd0e46a8ee384a5255b6189cd46ed694fcbecac.tar.gz
android_packages_apps_Trebuchet-6cd0e46a8ee384a5255b6189cd46ed694fcbecac.tar.bz2
android_packages_apps_Trebuchet-6cd0e46a8ee384a5255b6189cd46ed694fcbecac.zip
Accounting for bottom margin in the search box in app-scroll range am: 0bf251b643
Change-Id: Icd2c57f7de9b46d7d4581bea94faf7d132217094
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r--src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
index 5cb12d592..39e208874 100644
--- a/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
+++ b/src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java
@@ -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);