Merge "Update text size of overflow number view" into pi-dev (414be0b1) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -37,10 +37,10 @@ public class HybridGroupManager {
		private final NotificationDozeHelper mDozer;
		private final ViewGroup mParent;

		private final float mOverflowNumberSizeDark;
		private final int mOverflowNumberPaddingDark;
		private final float mOverflowNumberSize;
		private final int mOverflowNumberPadding;
		private float mOverflowNumberSizeDark;
		private int mOverflowNumberPaddingDark;
		private float mOverflowNumberSize;
		private int mOverflowNumberPadding;

		private int mOverflowNumberColor;
		private int mOverflowNumberColorDark;
		@@ -50,7 +50,10 @@ public class HybridGroupManager {
		mContext = ctx;
		mParent = parent;
		mDozer = new NotificationDozeHelper();
		initDimens();
		}

		public void initDimens() {
		Resources res = mContext.getResources();
		mOverflowNumberSize = res.getDimensionPixelSize(
		R.dimen.group_overflow_number_size);

+2 −1

Original line number	Diff line number	Diff line
		@@ -121,8 +121,8 @@ public class NotificationChildrenContainer extends ViewGroup {
		public NotificationChildrenContainer(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		initDimens();
		mHybridGroupManager = new HybridGroupManager(getContext(), this);
		initDimens();
		setClipChildren(false);
		}

		@@ -148,6 +148,7 @@ public class NotificationChildrenContainer extends ViewGroup {
		mTranslationForHeader = res.getDimensionPixelSize(
		com.android.internal.R.dimen.notification_content_margin)
		- mNotificationHeaderMargin;
		mHybridGroupManager.initDimens();
		}

		@Override