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

Commit 75de53a4 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 4689b284: am 1e5c3336: Merge "Fix measurement for dialog windows that do... 

am 4689b284: am 1e5c3336: Merge "Fix measurement for dialog windows that do not have fixed width" into jb-dev

* commit '4689b284':
  Fix measurement for dialog windows that do not have fixed width
parents 6fce46c6 4689b284

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

+1 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,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);
@@ -2114,6 +2113,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;

                    }

                }

            }