diff options
| author | Philip Milne <pmilne@google.com> | 2013-04-23 03:51:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-23 03:51:29 -0700 |
| commit | 089a75be5e33e13071754a727902224b6db60168 (patch) | |
| tree | 2a277f9c71936029f77f3225f8cc8462ab83a463 /core/java/android | |
| parent | 4837ea99c46e792e5f4d55e895c63d415888f1b4 (diff) | |
| parent | a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9 (diff) | |
am a7b2625d: Merge "Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets" into jb-mr2-dev
* commit 'a7b2625d43a8e83e3fb47ca261efad6e3f6fcde9':
Fix for bug 8578258: GridLayout is forcing wrong width to TextView widgets
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/widget/RelativeLayout.java | 7 |
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); |