commit 5e44e2b1ad84623dfd9a02bfacbe2e1aa083b652
author Jonathan Miranda <jonmiranda@google.com> Tue Nov 08 17:19:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 08 17:19:43 2016 +0000
tree 7bf122038dc80ea8723e5e8a9a4ef3b16a32e577
parent f92af1d4404791206f372199cb0e9941115ced8a
parent 3ca089905bb7aedbcdc4eb317e78a8f2393a539b

Merge "Use display metrics from resources." into ub-launcher3-master

src/com/android/launcher3/allapps/AllAppsContainerView.java

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index 34d8a83..c65a803 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -315,7 +315,8 @@
             if (!grid.isVerticalBarLayout()) {
                 MarginLayoutParams searchContainerLp =
                         (MarginLayoutParams) mSearchContainer.getLayoutParams();
-                searchContainerLp.height = grid.hotseatBarHeightPx;
+                searchContainerLp.height = mLauncher.getDragLayer().getInsets().top
+                        + grid.hotseatCellHeightPx;
                 mSearchContainer.setLayoutParams(searchContainerLp);
             }
             super.onMeasure(widthMeasureSpec, heightMeasureSpec);