summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TableLayout.java
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-02-22 16:34:51 -0800
committerPhilip Milne <pmilne@google.com>2012-02-22 18:32:39 -0800
commitc29f031598811486d83f418fd08fbfe1fc41788a (patch)
tree6a98ca1627cb484e2496aac59c7c89419c8de4d7 /core/java/android/widget/TableLayout.java
parent8ad41a3fdc140ef7dfc481d7db55fd73911f7b88 (diff)
Fix for bug 6050753.
The method: TypedArray: getLayoutDimension(int, String) throws an undocumented exception when either the width and/or height attributes are undefined. See the bug report above for reasons why this was deemed unhelpful both in the tools area and to developers in general. Fix by: 1. Documenting the conditions under which the method raises an exception. 2. Deprecating the method, advising callers to supply a default instead. Additionally, redefine the: ViewGroup: setBaseAttributes(TypedArray, int, int); methods to provide the appropriate defaults in ViewGroup subclasses as advised above. For the platform layouts the default value is WRAP_CONTENT (and is defined in the ViewGroup.LayoutParams class). The special cases are accomodated in LayoutParams subclasses in the following cases: Subclass width height FrameLayout.LayoutParams: MATCH_PARENT, MATCH_PARENT TableLayout.LayoutParams: MATCH_PARENT, WRAP_CONTENT TableRow.LayoutParams: MATCH_PARENT, WRAP_CONTENT Change-Id: I335a3bd8e2d7f7866692898ed73492635a5b61ea
Diffstat (limited to 'core/java/android/widget/TableLayout.java')
-rw-r--r--core/java/android/widget/TableLayout.java9
1 files changed, 2 insertions, 7 deletions
diff --git a/core/java/android/widget/TableLayout.java b/core/java/android/widget/TableLayout.java
index f5d374656d89..10690b10687f 100644
--- a/core/java/android/widget/TableLayout.java
+++ b/core/java/android/widget/TableLayout.java
@@ -735,14 +735,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);
}
}