summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-04-22 14:22:05 -0700
committerSelim Cinek <cinek@google.com>2015-04-22 14:22:05 -0700
commit06a24ebd77aab7b97f63fdc665bfaa83b8c04f05 (patch)
tree3893ffa4a5aec3faca6adb4fd27754670d734a69 /packages/SystemUI/src/com/android/systemui
parentf7de58130a6a38d62857f6b885986f6a5cc74fcb (diff)
downloadframeworks_base-06a24ebd77aab7b97f63fdc665bfaa83b8c04f05.zip
frameworks_base-06a24ebd77aab7b97f63fdc665bfaa83b8c04f05.tar.gz
frameworks_base-06a24ebd77aab7b97f63fdc665bfaa83b8c04f05.tar.bz2
Fixed a regression with collapsed notification heights
This could lead to collapsed notifications having and intrinsic height smaller than the collapsed size and notifications overlapping. Change-Id: Iabba19033f8069f1f75218280b97d3a1a45a5efb
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index 964d75f..1c53655 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -95,7 +95,7 @@ public class NotificationContentView extends FrameLayout {
if (mContractedChild != null) {
int size = Math.min(maxSize, mSmallHeight);
mContractedChild.measure(widthMeasureSpec,
- MeasureSpec.makeMeasureSpec(size, MeasureSpec.AT_MOST));
+ MeasureSpec.makeMeasureSpec(size, MeasureSpec.EXACTLY));
maxChildHeight = Math.max(maxChildHeight, mContractedChild.getMeasuredHeight());
}
if (mExpandedChild != null) {