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

Commit 1e5c3336 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix measurement for dialog windows that do not have fixed width" into jb-dev

parents 72e95cfe b8e056a8

policy/src/com/android/internal/policy/impl/PhoneWindow.java

+1 −1
Original line number Diff line number Diff line
@@ -2098,7 +2098,6 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            if (widthMode == AT_MOST) {

                final TypedValue tvw = isPortrait ? mFixedWidthMinor : mFixedWidthMajor;

                if (tvw != null && tvw.type != TypedValue.TYPE_NULL) {

                    fixedWidth = true;

                    final int w;

                    if (tvw.type == TypedValue.TYPE_DIMENSION) {

                        w = (int) tvw.getDimension(metrics);
@@ -2112,6 +2111,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
                        final int widthSize = MeasureSpec.getSize(widthMeasureSpec);

                        widthMeasureSpec = MeasureSpec.makeMeasureSpec(

                                Math.min(w, widthSize), EXACTLY);

                        fixedWidth = true;

                    }

                }

            }