diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-07-14 03:46:23 -0700 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2017-07-17 12:55:06 -0700 |
| commit | 0bf251b6433f8c463162d233031dfd03b5586ab0 (patch) | |
| tree | 3287bfe1b371f6e35a9a4b82e8dbb9f0554f07c5 | |
| parent | 28032006970703240f4abd34429608abd2358645 (diff) | |
| download | android_packages_apps_Trebuchet-0bf251b6433f8c463162d233031dfd03b5586ab0.tar.gz android_packages_apps_Trebuchet-0bf251b6433f8c463162d233031dfd03b5586ab0.tar.bz2 android_packages_apps_Trebuchet-0bf251b6433f8c463162d233031dfd03b5586ab0.zip | |
Accounting for bottom margin in the search box in app-scroll range
Bug: 2539098
Change-Id: I9d7cdb05d33af397a4adcfc2f1f6c1d380b9fb0e
| -rw-r--r-- | res/values-sw720dp/dimens.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index e836d7d78..b21120758 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> 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); |