Merge "Fixes layout of icons in notification header." (13863589) · Commits · e / os / android_frameworks_base

core/java/android/view/NotificationHeaderView.java

+9 −15

Original line number	Diff line number	Diff line
		@@ -201,22 +201,16 @@ public class NotificationHeaderView extends ViewGroup {
		int bottom = top + childHeight;
		int layoutLeft = left;
		int layoutRight = right;
		if (child == mExpandButton && mShowExpandButtonAtEnd) {
		if ((child == mExpandButton && mShowExpandButtonAtEnd)
		\|\| child == mProfileBadge
		\|\| child == mAppOps) {
		if (end == getMeasuredWidth()) {
		layoutRight = end - mContentEndMargin;
		end = layoutLeft = layoutRight - child.getMeasuredWidth();
		}
		if (child == mProfileBadge) {
		int paddingEnd = getPaddingEnd();
		if (mShowWorkBadgeAtEnd) {
		paddingEnd = mContentEndMargin;
		}
		layoutRight = end - paddingEnd;
		end = layoutLeft = layoutRight - child.getMeasuredWidth();
		} else {
		layoutRight = end - params.getMarginEnd();
		}
		if (child == mAppOps) {
		int paddingEnd = mContentEndMargin;
		layoutRight = end - paddingEnd;
		end = layoutLeft = layoutRight - child.getMeasuredWidth();
		layoutLeft = layoutRight - child.getMeasuredWidth();
		end = layoutLeft - params.getMarginStart();
		}
		if (getLayoutDirection() == LAYOUT_DIRECTION_RTL) {
		int ltrLeft = layoutLeft;

+1 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,7 @@
		android:background="@null"
		android:layout_width="@dimen/notification_header_expand_icon_size"
		android:layout_height="@dimen/notification_header_expand_icon_size"
		android:layout_marginStart="4dp"
		android:paddingTop="@dimen/notification_expand_button_padding_top"
		android:visibility="gone"
		android:contentDescription="@string/expand_button_content_description_collapsed"