diff options
| author | Mathias Agopian <mathias@google.com> | 2012-10-15 19:45:25 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2012-10-15 20:45:01 -0700 |
| commit | 6868d6f349610c15256471cc3d5fa708cbfd5f1d (patch) | |
| tree | e392c1de237063c353618ae31a4162239d237da0 /core/java/android/widget/TableLayout.java | |
| parent | 809bb404da66498f1723279542d2a7d1f4512052 (diff) | |
Revert "Revert "Fix for bug 6050753.""
Emergency revert -- fix reboot loop.
This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.
Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
Diffstat (limited to 'core/java/android/widget/TableLayout.java')
| -rw-r--r-- | core/java/android/widget/TableLayout.java | 9 |
1 files changed, 2 insertions, 7 deletions
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); } } |