diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-07-17 20:48:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-17 20:48:45 +0000 |
| commit | b49ff69b91ae3a2c8b3d45ebdb07e1218b5f1f4a (patch) | |
| tree | 0bfd154dae92ca50b5fbe23ebbf7a8deeec43c55 /src/com/android/launcher3 | |
| parent | 69675520650ea3e75d530c8e043a815881675779 (diff) | |
| parent | 0bf251b6433f8c463162d233031dfd03b5586ab0 (diff) | |
| download | android_packages_apps_Trebuchet-b49ff69b91ae3a2c8b3d45ebdb07e1218b5f1f4a.tar.gz android_packages_apps_Trebuchet-b49ff69b91ae3a2c8b3d45ebdb07e1218b5f1f4a.tar.bz2 android_packages_apps_Trebuchet-b49ff69b91ae3a2c8b3d45ebdb07e1218b5f1f4a.zip | |
Merge "Accounting for bottom margin in the search box in app-scroll range" into ub-launcher3-dorval-polish
Diffstat (limited to 'src/com/android/launcher3')
| -rw-r--r-- | src/com/android/launcher3/allapps/search/AppsSearchContainerLayout.java | 3 |
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); |