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

Commit 2555a5d4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes NotificationHeaderView layout."

parents 0c1ebffd c79816b0

core/java/android/view/NotificationHeaderView.java

+8 −5
Original line number Diff line number Diff line
@@ -195,12 +195,10 @@ public class NotificationHeaderView extends ViewGroup { 
            }

            int childHeight = child.getMeasuredHeight();

            MarginLayoutParams params = (MarginLayoutParams) child.getLayoutParams();

            left += params.getMarginStart();

            int right = left + child.getMeasuredWidth();

            int layoutLeft;

            int layoutRight;

            int top = (int) (getPaddingTop() + (ownHeight - childHeight) / 2.0f);

            int bottom = top + childHeight;

            int layoutLeft = left;

            int layoutRight = right;

            if ((child == mExpandButton && mShowExpandButtonAtEnd)

                    || child == mProfileBadge

                    || child == mAppOps) {
@@ -211,6 +209,12 @@ public class NotificationHeaderView extends ViewGroup { 
                }

                layoutLeft = layoutRight - child.getMeasuredWidth();

                end = layoutLeft - params.getMarginStart();

            } else {

                left += params.getMarginStart();

                int right = left + child.getMeasuredWidth();

                layoutLeft = left;

                layoutRight = right;

                left = right + params.getMarginEnd();

            }

            if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {

                int ltrLeft = layoutLeft;
@@ -218,7 +222,6 @@ public class NotificationHeaderView extends ViewGroup { 
                layoutRight = getWidth() - ltrLeft;

            }

            child.layout(layoutLeft, top, layoutRight, bottom);

            left = right + params.getMarginEnd();

        }

        updateTouchListener();

    }