summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-06-05 18:09:35 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-05 18:09:35 +0000
commit6103501fa6c70ca112ac867e18e5f82021bf4f7c (patch)
tree7a371d309afdabb03f7db35bb17288ecc065cdf4 /src/com/android/launcher3/allapps/AllAppsGridAdapter.java
parent7501adf4b71bb17d0785a5939efbcac4b39125c3 (diff)
parent2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8 (diff)
downloadandroid_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.tar.gz
android_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.tar.bz2
android_packages_apps_Trebuchet-6103501fa6c70ca112ac867e18e5f82021bf4f7c.zip
Merge "Ensuring that we use the screen width more optimally in AllApps." into ub-launcher3-burnaby
Diffstat (limited to 'src/com/android/launcher3/allapps/AllAppsGridAdapter.java')
-rw-r--r--src/com/android/launcher3/allapps/AllAppsGridAdapter.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index 02a950fde..4b8b2dfc8 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -140,7 +140,7 @@ class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHol
if (shouldDrawItemDivider(holder, items) && !hasDrawnPredictedAppsDivider) {
// Draw the divider under the predicted apps
- int top = child.getTop() + child.getHeight();
+ int top = child.getTop() + child.getHeight() - mPredictionBarBottomPadding / 2;
c.drawLine(mBackgroundPadding.left, top,
parent.getWidth() - mBackgroundPadding.right, top,
mPredictedAppsDividerPaint);
@@ -295,6 +295,7 @@ class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHol
private View.OnLongClickListener mIconLongClickListener;
@Thunk final Rect mBackgroundPadding = new Rect();
@Thunk int mPredictionBarHeight;
+ @Thunk int mPredictionBarBottomPadding;
@Thunk int mAppsPerRow;
@Thunk boolean mIsRtl;
private String mEmptySearchText;
@@ -337,6 +338,8 @@ class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHol
mPredictedAppsDividerPaint.setStrokeWidth(Utilities.pxFromDp(1f, res.getDisplayMetrics()));
mPredictedAppsDividerPaint.setColor(0x1E000000);
mPredictedAppsDividerPaint.setAntiAlias(true);
+ mPredictionBarBottomPadding =
+ res.getDimensionPixelSize(R.dimen.all_apps_prediction_bar_bottom_padding);
}
/**