Merge "Fixed a bug where notifications could overlap" into nyc-dev (33e2fc48) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -177,6 +177,13 @@ public class NotificationContentView extends FrameLayout {
	if (updateContractedHeaderWidth()) {		if (updateContractedHeaderWidth()) {
	mContractedChild.measure(widthMeasureSpec, heightSpec);		mContractedChild.measure(widthMeasureSpec, heightSpec);
	}		}
			if (mExpandedChild != null
			&& mContractedChild.getMeasuredHeight() > mExpandedChild.getMeasuredHeight()) {
			// the Expanded child is smaller then the collapsed. Let's remeasure it.
			heightSpec = MeasureSpec.makeMeasureSpec(mContractedChild.getMeasuredHeight(),
			MeasureSpec.EXACTLY);
			mExpandedChild.measure(widthMeasureSpec, heightSpec);
			}
	}		}
	if (mHeadsUpChild != null) {		if (mHeadsUpChild != null) {
	int size = Math.min(maxSize, mHeadsUpHeight);		int size = Math.min(maxSize, mHeadsUpHeight);