summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2013-04-23 16:13:18 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-23 16:13:18 -0700
commit6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30 (patch)
treed8f73468df24c613330262122f3e071262a8fd95
parent2e0a94d22b1bd25c4fa9442e03c596bd0cb3fe76 (diff)
parenta6d5109dd69791ba51e469c30d522dc27ab2c69c (diff)
downloadframeworks_base-6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30.zip
frameworks_base-6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30.tar.gz
frameworks_base-6edbfb9cdc4d3a83d424565371e78dcdb9a0bb30.tar.bz2
am a6d5109d: Merge "Fix for bug 8578258." into jb-mr2-dev
* commit 'a6d5109dd69791ba51e469c30d522dc27ab2c69c': Fix for bug 8578258.
-rw-r--r--core/java/android/widget/RelativeLayout.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java
index 906f02d..f940226 100644
--- a/core/java/android/widget/RelativeLayout.java
+++ b/core/java/android/widget/RelativeLayout.java
@@ -231,7 +231,7 @@ public class RelativeLayout extends ViewGroup {
* {@link View#MEASURED_SIZE_MASK}.
* {@link View#MEASURED_STATE_TOO_SMALL}.
**/
- private static final int DEFAULT_WIDTH = 0x008000000;
+ private static final int DEFAULT_WIDTH = 0x00010000;
public RelativeLayout(Context context) {
super(context);