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

Merge "Handle non-exact measure passes in ZenModeView."

Browse Source
This commit is contained in:
John Spurlock
2014-03-03 18:41:45 +00:00
committed by Android (Google) Code Review
parent 08488bf3fe 756fa2ab9f
commit 6ef3c2cbbb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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