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

Commit 089a75be authored by Philip Milne's avatar Philip Milne Committed by Android Git Automerger
Browse files

am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to... 

am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev

* commit 'a7b2625d':
  Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
parents 4837ea99 a7b2625d

core/java/android/widget/RelativeLayout.java

+6 −1
Original line number Diff line number Diff line
@@ -226,7 +226,12 @@ public class RelativeLayout extends ViewGroup { 
    private boolean mMeasureVerticalWithPaddingMargin = false;



    // A default width used for RTL measure pass

    private static final int DEFAULT_WIDTH = Integer.MAX_VALUE / 2;

    /**

     * Value reduced so as not to interfere with View's measurement spec. flags. See:

     * {@link View#MEASURED_SIZE_MASK}.

     * {@link View#MEASURED_STATE_TOO_SMALL}.

     **/

    private static final int DEFAULT_WIDTH = 0x008000000;



    public RelativeLayout(Context context) {

        super(context);