Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ef3c2cb authored by John Spurlock's avatar John Spurlock Committed by Android (Google) Code Review
Browse files

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

parents 08488bf3 756fa2ab

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

+3 −4
Original line number Diff line number Diff line
@@ -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);