Merge "Remove applyBackground param in decorator" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
9727caec8d
@@ -56,7 +56,7 @@ public class PrivateAppsSectionDecorator extends RecyclerView.ItemDecoration {
|
||||
new SectionDecorationHandler.UnionDecorationHandler(
|
||||
decorationHandler, parent.getPaddingLeft(),
|
||||
parent.getPaddingRight()));
|
||||
unionHandler.addChild(decorationHandler, view, true /* applyBackground */);
|
||||
unionHandler.addChild(decorationHandler, view);
|
||||
deferredDecorations.put(PRIVATE_APP_SECTION, unionHandler);
|
||||
} else {
|
||||
decorationHandler.onFocusDraw(c, view);
|
||||
|
||||
@@ -176,13 +176,10 @@ public class SectionDecorationHandler {
|
||||
/**
|
||||
* Expands decoration bounds to include child {@link PrivateAppsSectionDecorator}
|
||||
*/
|
||||
public void addChild(SectionDecorationHandler child, View view, boolean applyBackground) {
|
||||
public void addChild(SectionDecorationHandler child, View view) {
|
||||
int scaledHeight = (int) (view.getHeight() * view.getScaleY());
|
||||
mBounds.union(view.getLeft(), view.getY(),
|
||||
view.getRight(), view.getY() + scaledHeight);
|
||||
if (applyBackground) {
|
||||
applyBackground(view, mContext, null, false);
|
||||
}
|
||||
mIsBottomRound |= child.mIsBottomRound;
|
||||
mIsBottomLeftRound |= child.mIsBottomLeftRound;
|
||||
mIsBottomRightRound |= child.mIsBottomRightRound;
|
||||
|
||||
Reference in New Issue
Block a user