diff options
| author | Selim Cinek <cinek@google.com> | 2015-04-22 23:53:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-22 23:53:59 +0000 |
| commit | 5f94c4da757f3e6ddcf202d358d6831fb1dd6cb6 (patch) | |
| tree | d8ba9b79a6f2640c432c7216410d3da336146686 /packages/SystemUI/src/com/android/systemui | |
| parent | 1816b396c8fee341e3fa15e87409494826340cee (diff) | |
| parent | 06a24ebd77aab7b97f63fdc665bfaa83b8c04f05 (diff) | |
| download | frameworks_base-5f94c4da757f3e6ddcf202d358d6831fb1dd6cb6.zip frameworks_base-5f94c4da757f3e6ddcf202d358d6831fb1dd6cb6.tar.gz frameworks_base-5f94c4da757f3e6ddcf202d358d6831fb1dd6cb6.tar.bz2 | |
Merge "Fixed a regression with collapsed notification heights"
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java | 2 |
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) { |