Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 33e2fc481c

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

Change-Id: Ib93924d2c6828bca840a4529531f64a6278b4af0
This commit is contained in:
Selim Cinek
2016-04-22 15:40:25 +00:00
committed by android-build-merger
parent eca1026d72 33e2fc481c
commit 53405ffa62
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
View File

@@ -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);