Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9727caec authored by Brandon Dayauon's avatar Brandon Dayauon Committed by Android (Google) Code Review
Browse files

Merge "Remove applyBackground param in decorator" into main

parents a47eff5e 65e37391

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

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −4
Original line number Diff line number Diff line
@@ -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;