Merge "Fix typo in the word "notification"" (0bc1b6db) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationChildrenContainer.java

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -75,7 +75,7 @@ public class NotificationChildrenContainer extends ViewGroup {
	private float mDividerAlpha;		private float mDividerAlpha;
	private int mNotificationHeaderMargin;		private int mNotificationHeaderMargin;

	private int mNotificatonTopPadding;		private int mNotificationTopPadding;
	private float mCollapsedBottompadding;		private float mCollapsedBottompadding;
	private boolean mChildrenExpanded;		private boolean mChildrenExpanded;
	private ExpandableNotificationRow mContainingNotification;		private ExpandableNotificationRow mContainingNotification;
	@@ -140,9 +140,9 @@ public class NotificationChildrenContainer extends ViewGroup {
	mDividerAlpha = res.getFloat(R.dimen.notification_divider_alpha);		mDividerAlpha = res.getFloat(R.dimen.notification_divider_alpha);
	mNotificationHeaderMargin = res.getDimensionPixelSize(		mNotificationHeaderMargin = res.getDimensionPixelSize(
	R.dimen.notification_children_container_margin_top);		R.dimen.notification_children_container_margin_top);
	mNotificatonTopPadding = res.getDimensionPixelSize(		mNotificationTopPadding = res.getDimensionPixelSize(
	R.dimen.notification_children_container_top_padding);		R.dimen.notification_children_container_top_padding);
	mHeaderHeight = mNotificationHeaderMargin + mNotificatonTopPadding;		mHeaderHeight = mNotificationHeaderMargin + mNotificationTopPadding;
	mCollapsedBottompadding = res.getDimensionPixelSize(		mCollapsedBottompadding = res.getDimensionPixelSize(
	com.android.internal.R.dimen.notification_content_margin);		com.android.internal.R.dimen.notification_content_margin);
	mEnableShadowOnChildNotifications =		mEnableShadowOnChildNotifications =
	@@ -203,7 +203,7 @@ public class NotificationChildrenContainer extends ViewGroup {
	newHeightSpec);		newHeightSpec);
	}		}
	int dividerHeightSpec = MeasureSpec.makeMeasureSpec(mDividerHeight, MeasureSpec.EXACTLY);		int dividerHeightSpec = MeasureSpec.makeMeasureSpec(mDividerHeight, MeasureSpec.EXACTLY);
	int height = mNotificationHeaderMargin + mNotificatonTopPadding;		int height = mNotificationHeaderMargin + mNotificationTopPadding;
	int childCount =		int childCount =
	Math.min(mAttachedChildren.size(), NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED);		Math.min(mAttachedChildren.size(), NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED);
	int collapsedChildren = getMaxAllowedVisibleChildren(true /* likeCollapsed */);		int collapsedChildren = getMaxAllowedVisibleChildren(true /* likeCollapsed */);
	@@ -526,11 +526,11 @@ public class NotificationChildrenContainer extends ViewGroup {
	if (mUserLocked) {		if (mUserLocked) {
	intrinsicHeight += NotificationUtils.interpolate(		intrinsicHeight += NotificationUtils.interpolate(
	0,		0,
	mNotificatonTopPadding + mDividerHeight,		mNotificationTopPadding + mDividerHeight,
	expandFactor);		expandFactor);
	} else {		} else {
	intrinsicHeight += childrenExpanded		intrinsicHeight += childrenExpanded
	? mNotificatonTopPadding + mDividerHeight		? mNotificationTopPadding + mDividerHeight
	: 0;		: 0;
	}		}
	firstChild = false;		firstChild = false;
	@@ -583,10 +583,10 @@ public class NotificationChildrenContainer extends ViewGroup {
	if (expandingToExpandedGroup) {		if (expandingToExpandedGroup) {
	yPosition += NotificationUtils.interpolate(		yPosition += NotificationUtils.interpolate(
	0,		0,
	mNotificatonTopPadding + mDividerHeight,		mNotificationTopPadding + mDividerHeight,
	expandFactor);		expandFactor);
	} else {		} else {
	yPosition += mChildrenExpanded ? mNotificatonTopPadding + mDividerHeight : 0;		yPosition += mChildrenExpanded ? mNotificationTopPadding + mDividerHeight : 0;
	}		}
	firstChild = false;		firstChild = false;
	}		}
	@@ -1009,7 +1009,7 @@ public class NotificationChildrenContainer extends ViewGroup {
	/* likeHighPriority */);		/* likeHighPriority */);
	}		}
	int maxContentHeight = mNotificationHeaderMargin + mCurrentHeaderTranslation		int maxContentHeight = mNotificationHeaderMargin + mCurrentHeaderTranslation
	+ mNotificatonTopPadding;		+ mNotificationTopPadding;
	int visibleChildren = 0;		int visibleChildren = 0;
	int childCount = mAttachedChildren.size();		int childCount = mAttachedChildren.size();
	for (int i = 0; i < childCount; i++) {		for (int i = 0; i < childCount; i++) {
	@@ -1072,7 +1072,7 @@ public class NotificationChildrenContainer extends ViewGroup {

	private int getVisibleChildrenExpandHeight() {		private int getVisibleChildrenExpandHeight() {
	int intrinsicHeight = mNotificationHeaderMargin + mCurrentHeaderTranslation		int intrinsicHeight = mNotificationHeaderMargin + mCurrentHeaderTranslation
	+ mNotificatonTopPadding + mDividerHeight;		+ mNotificationTopPadding + mDividerHeight;
	int visibleChildren = 0;		int visibleChildren = 0;
	int childCount = mAttachedChildren.size();		int childCount = mAttachedChildren.size();
	int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* forceCollapsed */);		int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* forceCollapsed */);
	@@ -1212,7 +1212,7 @@ public class NotificationChildrenContainer extends ViewGroup {

	public int getPositionInLinearLayout(View childInGroup) {		public int getPositionInLinearLayout(View childInGroup) {
	int position = mNotificationHeaderMargin + mCurrentHeaderTranslation		int position = mNotificationHeaderMargin + mCurrentHeaderTranslation
	+ mNotificatonTopPadding;		+ mNotificationTopPadding;

	for (int i = 0; i < mAttachedChildren.size(); i++) {		for (int i = 0; i < mAttachedChildren.size(); i++) {
	ExpandableNotificationRow child = mAttachedChildren.get(i);		ExpandableNotificationRow child = mAttachedChildren.get(i);