diff options
| author | John Spurlock <jspurlock@google.com> | 2014-03-03 18:41:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-03 18:41:45 +0000 |
| commit | 6ef3c2cbbb72201e9b2216fb96d071e0fac654d1 (patch) | |
| tree | 33c75ac27fb1f516f724f17d296f983b51494e3f | |
| parent | 08488bf3fe6f4b1fadf59821feaf07b4c2ae52ae (diff) | |
| parent | 756fa2ab9ff07ba994d4e45a32b7da77b4b5b168 (diff) | |
| download | frameworks_base-6ef3c2cbbb72201e9b2216fb96d071e0fac654d1.zip frameworks_base-6ef3c2cbbb72201e9b2216fb96d071e0fac654d1.tar.gz frameworks_base-6ef3c2cbbb72201e9b2216fb96d071e0fac654d1.tar.bz2 | |
Merge "Handle non-exact measure passes in ZenModeView."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeView.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeView.java index 783e371..c4d2cce 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ZenModeView.java @@ -261,10 +261,9 @@ public class ZenModeView extends RelativeLayout { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { if (DEBUG) log("onMeasure %s %s", MeasureSpec.toString(widthMeasureSpec), MeasureSpec.toString(heightMeasureSpec)); - if (MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.EXACTLY) { - throw new UnsupportedOperationException("Width must be exact"); - } - if (widthMeasureSpec != mWidthSpec) { + final boolean widthExact = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY; + + if (!widthExact || (widthMeasureSpec != mWidthSpec)) { if (DEBUG) log(" super.onMeasure"); final int hms = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED); super.onMeasure(widthMeasureSpec, hms); |