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

Author: adamp

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

@@ -2098,7 +2098,6 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
             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 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                         final int widthSize = MeasureSpec.getSize(widthMeasureSpec);
                         widthMeasureSpec = MeasureSpec.makeMeasureSpec(
                                 Math.min(w, widthSize), EXACTLY);
+                        fixedWidth = true;
                     }
                 }
             }