diff options
author | Justin Ho <justinho@google.com> | 2012-10-17 16:06:15 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 16:06:15 -0700 |
commit | f1149452694713670a5e3849693841c0fbab0f25 (patch) | |
tree | 6d564fa5187c8aaac81ee20f4f44785134c44e01 /core/java/android/widget/TableRow.java | |
parent | 5c555f39fb9bb1a47c081ae62658454e92792f44 (diff) | |
parent | 22bd3726be37a24e956d962d61657d8a3d54c985 (diff) | |
download | frameworks_base-f1149452694713670a5e3849693841c0fbab0f25.zip frameworks_base-f1149452694713670a5e3849693841c0fbab0f25.tar.gz frameworks_base-f1149452694713670a5e3849693841c0fbab0f25.tar.bz2 |
am 22bd3726: am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev
* commit '22bd3726be37a24e956d962d61657d8a3d54c985':
Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
Diffstat (limited to 'core/java/android/widget/TableRow.java')
-rw-r--r-- | core/java/android/widget/TableRow.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index a8cc406..a647d10 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -505,19 +505,8 @@ public class TableRow extends LinearLayout { @Override protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) { - // We don't want to force users to specify a layout_width - if (a.hasValue(widthAttr)) { - width = a.getLayoutDimension(widthAttr, "layout_width"); - } else { - width = MATCH_PARENT; - } - - // We don't want to force users to specify a layout_height - if (a.hasValue(heightAttr)) { - height = a.getLayoutDimension(heightAttr, "layout_height"); - } else { - height = WRAP_CONTENT; - } + width = a.getLayoutDimension(widthAttr, MATCH_PARENT); + height = a.getLayoutDimension(heightAttr, WRAP_CONTENT); } } |