diff options
| author | Adrian Roos <roosa@google.com> | 2014-08-07 20:54:12 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-08-08 13:17:55 +0000 |
| commit | 1940892d891c1d2538f51608b6618af646ab7481 (patch) | |
| tree | b5178aec3a8e85506b72f8c89c056a7ff3874f78 /packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | |
| parent | dd06d04064f678916e9687d80c70f392fb692177 (diff) | |
| download | frameworks_base-1940892d891c1d2538f51608b6618af646ab7481.zip frameworks_base-1940892d891c1d2538f51608b6618af646ab7481.tar.gz frameworks_base-1940892d891c1d2538f51608b6618af646ab7481.tar.bz2 | |
QS: Make user switcher expand when users don't fit
Also updates the switcher to match the latest redlines.
Bug: 16406694
Change-Id: Ibf44ed9ea2ef4e3c467724eb4c79f1df5b3e49f4
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/qs/QSPanel.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/qs/QSPanel.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java index 59f3b3d..3679b4c 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java @@ -326,8 +326,11 @@ public class QSPanel extends ViewGroup { if (mFooter.hasFooter()) { h += mFooter.getView().getHeight(); } - mDetail.measure(exactly(width), exactly(h)); - setMeasuredDimension(width, h); + mDetail.measure(exactly(width), MeasureSpec.UNSPECIFIED); + if (mDetail.getMeasuredHeight() < h) { + mDetail.measure(exactly(width), exactly(h)); + } + setMeasuredDimension(width, Math.max(h, mDetail.getMeasuredHeight())); } private static int exactly(int size) { |