diff options
author | Winson Chung <winsonc@google.com> | 2015-06-01 14:38:24 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-06-05 09:49:12 -0700 |
commit | 2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8 (patch) | |
tree | f181fbee9f46ddf18adc42a4d9c823ccd2f1b5fe /src/com/android/launcher3/allapps | |
parent | a56eab41fbfe26b185cc8240d50d231d0db41837 (diff) | |
download | android_packages_apps_Trebuchet-2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8.tar.gz android_packages_apps_Trebuchet-2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8.tar.bz2 android_packages_apps_Trebuchet-2c6e5ccbcd7c3f87e7e85029782440600dc0a3d8.zip |
Ensuring that we use the screen width more optimally in AllApps.
- Fixing issue with prediction bar height being calculated incorrectly
- Fixing issue where the prediction bar divider was not drawn exactly
between the bar and the first row of apps
- Removing padding to allow scrollbars to reach full height
Bug: 20222023
Bug: 21335377
Change-Id: I2c0614a36e2294d0d6184a6bff4847876ffe971e
Diffstat (limited to 'src/com/android/launcher3/allapps')
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsContainerView.java | 19 | ||||
-rw-r--r-- | src/com/android/launcher3/allapps/AllAppsGridAdapter.java | 5 |
2 files changed, 14 insertions, 10 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 9386500be..76ca9633d 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -20,6 +20,7 @@ import android.annotation.TargetApi; import android.content.ComponentName; import android.content.Context; import android.content.res.Resources; +import android.graphics.Paint; import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -239,11 +240,11 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc mLauncher = (Launcher) context; DeviceProfile grid = mLauncher.getDeviceProfile(); - mContainerInset = context.getResources().getDimensionPixelSize( - R.dimen.all_apps_container_inset); - mPredictionBarHeight = grid.allAppsIconSizePx + grid.iconDrawablePaddingOriginalPx + - grid.allAppsIconTextSizePx + - 2 * res.getDimensionPixelSize(R.dimen.all_apps_prediction_icon_top_bottom_padding); + mContainerInset = res.getDimensionPixelSize(R.dimen.all_apps_container_inset); + mPredictionBarHeight = (int) (grid.allAppsIconSizePx + grid.iconDrawablePaddingOriginalPx + + Utilities.calculateTextHeight(grid.allAppsIconTextSizePx) + + 2 * res.getDimensionPixelSize(R.dimen.all_apps_icon_top_bottom_padding) + + res.getDimensionPixelSize(R.dimen.all_apps_prediction_bar_bottom_padding)); mLayoutInflater = LayoutInflater.from(context); @@ -497,11 +498,11 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc int startMargin = grid.isPhone ? mContentMarginStart : 0; int inset = mFixedBounds.isEmpty() ? mContainerInset : mFixedBoundsContainerInset; if (isRtl) { - mAppsRecyclerView.setPadding(inset + mAppsRecyclerView.getScrollbarWidth(), inset, - inset + startMargin, inset); + mAppsRecyclerView.setPadding(inset + mAppsRecyclerView.getScrollbarWidth(), 0, + inset + startMargin, 0); } else { - mAppsRecyclerView.setPadding(inset + startMargin, inset, - inset + mAppsRecyclerView.getScrollbarWidth(), inset); + mAppsRecyclerView.setPadding(inset + startMargin, 0, + inset + mAppsRecyclerView.getScrollbarWidth(), 0); } // Update the header bar diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java index 307d9403d..102e7ae8d 100644 --- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java +++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java @@ -139,7 +139,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); @@ -294,6 +294,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; @@ -336,6 +337,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); } /** |