Removing unused background padding from base recycler view

Change-Id: I36f68a143df8f3668074b3539aa9af170a91e511
This commit is contained in:
Sunny Goyal
2016-10-18 14:23:46 +01:00
parent d2959b9ee7
commit 00e106880d
5 changed files with 18 additions and 71 deletions
@@ -162,27 +162,10 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
}
}
/**
* We need to override the draw to ensure that we don't draw the overscroll effect beyond the
* background bounds.
*/
@Override
protected void dispatchDraw(Canvas canvas) {
// Clip to ensure that we don't draw the overscroll effect beyond the background bounds
canvas.clipRect(mBackgroundPadding.left, mBackgroundPadding.top,
getWidth() - mBackgroundPadding.right,
getHeight() - mBackgroundPadding.bottom);
super.dispatchDraw(canvas);
}
@Override
public void onDraw(Canvas c) {
// Draw the background
if (mEmptySearchBackground != null && mEmptySearchBackground.getAlpha() > 0) {
c.clipRect(mBackgroundPadding.left, mBackgroundPadding.top,
getWidth() - mBackgroundPadding.right,
getHeight() - mBackgroundPadding.bottom);
mEmptySearchBackground.draw(c);
}
@@ -319,8 +302,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
// Calculate the current scroll position, the scrollY of the recycler view accounts
// for the view padding, while the scrollBarY is drawn right up to the background
// padding (ignoring padding)
int scrollBarY = mBackgroundPadding.top +
(int) (((float) scrollY / availableScrollHeight) * availableScrollBarHeight);
int scrollBarY = (int)
(((float) scrollY / availableScrollHeight) * availableScrollBarHeight);
int thumbScrollY = mScrollbar.getThumbOffsetY();
int diffScrollY = scrollBarY - thumbScrollY;
@@ -411,8 +394,8 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
}
@Override
protected int getVisibleHeight() {
return super.getVisibleHeight()
protected int getScrollbarTrackHeight() {
return super.getScrollbarTrackHeight()
- Launcher.getLauncher(getContext()).getDragLayer().getInsets().bottom;
}
@@ -424,7 +407,7 @@ public class AllAppsRecyclerView extends BaseRecyclerView {
protected int getAvailableScrollHeight() {
int paddedHeight = getCurrentScrollY(mApps.getAdapterItems().size(), 0);
int totalHeight = paddedHeight + getPaddingBottom();
return totalHeight - getVisibleHeight();
return totalHeight - getScrollbarTrackHeight();
}
/**