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

1 files changed, 6 insertions, 1 deletions

diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 3df7258ba44c..906f02dc4a1f 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -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);