From 57fca90ac65ecfe97acd4c93d442c3db8f815e11 Mon Sep 17 00:00:00 2001 From: Justin Ho Date: Wed, 17 Oct 2012 10:47:39 -0700 Subject: Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." This reverts commit dcf59629beed8182759a1068ab8ee997935bef82 Change-Id: I27426a0ffe993973ffb0b05ce1ed3afe73fcd87d --- core/java/android/widget/TableRow.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'core/java/android/widget/TableRow.java') diff --git a/core/java/android/widget/TableRow.java b/core/java/android/widget/TableRow.java index 68ffd733f6ad..3f8f9dae640e 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); } } -- cgit v1.2.3