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/TableLayout.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'core/java/android/widget/TableLayout.java') diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java index 399b4fa14544..113299a73cee 100644 --- a/core/java/android/widget/TableLayout.java +++ b/core/java/android/widget/TableLayout.java @@ -741,14 +741,9 @@ public class TableLayout extends LinearLayout { * @param heightAttr the height attribute to fetch */ @Override - protected void setBaseAttributes(TypedArray a, - int widthAttr, int heightAttr) { + protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) { this.width = MATCH_PARENT; - if (a.hasValue(heightAttr)) { - this.height = a.getLayoutDimension(heightAttr, "layout_height"); - } else { - this.height = WRAP_CONTENT; - } + this.height = a.getLayoutDimension(heightAttr, WRAP_CONTENT); } } -- cgit v1.2.3