diff options
author | Romain Guy <romainguy@google.com> | 2012-10-15 13:24:58 -0700 |
---|---|---|
committer | Romain Guy <romainguy@google.com> | 2012-10-15 13:24:58 -0700 |
commit | 8e63bcc63fd002231f8391af8982eeb235d096c8 (patch) | |
tree | 75b2a0fceb1b7a366665b78bee09ac01786ee06e /core/java/android/widget/TableRow.java | |
parent | a30d969401a8533a5a341664421ba9b1e150bac3 (diff) | |
download | frameworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.zip frameworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.tar.gz frameworks_base-8e63bcc63fd002231f8391af8982eeb235d096c8.tar.bz2 |
Revert "Fix for bug 6050753."
This reverts commit c29f031598811486d83f418fd08fbfe1fc41788a.
Diffstat (limited to 'core/java/android/widget/TableRow.java')
-rw-r--r-- | core/java/android/widget/TableRow.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index 3f8f9dae..68ffd73 100644 --- a/core/java/android/widget/TableRow.java +++ b/core/java/android/widget/TableRow.java @@ -505,8 +505,19 @@ public class TableRow extends LinearLayout { @Override protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) { - width = a.getLayoutDimension(widthAttr, MATCH_PARENT); - height = a.getLayoutDimension(heightAttr, WRAP_CONTENT); + // 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; + } } } |