Merge "Update text size of overflow number view" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
414be0b1cb
@@ -37,10 +37,10 @@ public class HybridGroupManager {
|
|||||||
private final NotificationDozeHelper mDozer;
|
private final NotificationDozeHelper mDozer;
|
||||||
private final ViewGroup mParent;
|
private final ViewGroup mParent;
|
||||||
|
|
||||||
private final float mOverflowNumberSizeDark;
|
private float mOverflowNumberSizeDark;
|
||||||
private final int mOverflowNumberPaddingDark;
|
private int mOverflowNumberPaddingDark;
|
||||||
private final float mOverflowNumberSize;
|
private float mOverflowNumberSize;
|
||||||
private final int mOverflowNumberPadding;
|
private int mOverflowNumberPadding;
|
||||||
|
|
||||||
private int mOverflowNumberColor;
|
private int mOverflowNumberColor;
|
||||||
private int mOverflowNumberColorDark;
|
private int mOverflowNumberColorDark;
|
||||||
@@ -50,7 +50,10 @@ public class HybridGroupManager {
|
|||||||
mContext = ctx;
|
mContext = ctx;
|
||||||
mParent = parent;
|
mParent = parent;
|
||||||
mDozer = new NotificationDozeHelper();
|
mDozer = new NotificationDozeHelper();
|
||||||
|
initDimens();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void initDimens() {
|
||||||
Resources res = mContext.getResources();
|
Resources res = mContext.getResources();
|
||||||
mOverflowNumberSize = res.getDimensionPixelSize(
|
mOverflowNumberSize = res.getDimensionPixelSize(
|
||||||
R.dimen.group_overflow_number_size);
|
R.dimen.group_overflow_number_size);
|
||||||
|
|||||||
@@ -121,8 +121,8 @@ public class NotificationChildrenContainer extends ViewGroup {
|
|||||||
public NotificationChildrenContainer(Context context, AttributeSet attrs, int defStyleAttr,
|
public NotificationChildrenContainer(Context context, AttributeSet attrs, int defStyleAttr,
|
||||||
int defStyleRes) {
|
int defStyleRes) {
|
||||||
super(context, attrs, defStyleAttr, defStyleRes);
|
super(context, attrs, defStyleAttr, defStyleRes);
|
||||||
initDimens();
|
|
||||||
mHybridGroupManager = new HybridGroupManager(getContext(), this);
|
mHybridGroupManager = new HybridGroupManager(getContext(), this);
|
||||||
|
initDimens();
|
||||||
setClipChildren(false);
|
setClipChildren(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -148,6 +148,7 @@ public class NotificationChildrenContainer extends ViewGroup {
|
|||||||
mTranslationForHeader = res.getDimensionPixelSize(
|
mTranslationForHeader = res.getDimensionPixelSize(
|
||||||
com.android.internal.R.dimen.notification_content_margin)
|
com.android.internal.R.dimen.notification_content_margin)
|
||||||
- mNotificationHeaderMargin;
|
- mNotificationHeaderMargin;
|
||||||
|
mHybridGroupManager.initDimens();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user