diff options
| author | Mathias Agopian <mathias@google.com> | 2012-10-15 20:53:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-15 20:53:21 -0700 |
| commit | d8c4f50981a887b8332ad3abdb51c4cb4151dcb8 (patch) | |
| tree | d9012e18366eab38f374ddfda1e561e6e7b8d8ed /core/java/android/widget/TableRow.java | |
| parent | 0d4f45d9421ac5c80edeef8e838c2b874e548157 (diff) | |
| parent | 1167b7b9e43878f077478f58e31e268c2e191110 (diff) | |
| download | frameworks_base-d8c4f50981a887b8332ad3abdb51c4cb4151dcb8.zip frameworks_base-d8c4f50981a887b8332ad3abdb51c4cb4151dcb8.tar.gz frameworks_base-d8c4f50981a887b8332ad3abdb51c4cb4151dcb8.tar.bz2 | |
am 1167b7b9: am dcfe6cee: am 6868d6f3: Revert "Revert "Fix for bug 6050753.""
* commit '1167b7b9e43878f077478f58e31e268c2e191110':
Revert "Revert "Fix for bug 6050753.""
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); } } |