Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c59734d8 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed a bug where notifications could overlap" into nyc-dev 

am: 33e2fc48

* commit '33e2fc48':
  Fixed a bug where notifications could overlap

Change-Id: Iae3ac699b1a1ce5d6cb01cba2465387a0dab702b
parents 08264334 33e2fc48

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

+7 −0
Original line number Diff line number Diff line
@@ -177,6 +177,13 @@ public class NotificationContentView extends FrameLayout { 
            if (updateContractedHeaderWidth()) {

                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) {

            int size = Math.min(maxSize, mHeadsUpHeight);