summaryrefslogtreecommitdiff
path: root/core/java/android/widget/FrameLayout.java
diff options
context:
space:
mode:
authorPhilip Milne <pmilne@google.com>2012-05-31 10:30:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-05-31 10:30:09 -0700
commit0597161ee43cfaa7dbe14691a134fb358a00317a (patch)
tree07a18597f6057118321835913d01b4f2361c0a29 /core/java/android/widget/FrameLayout.java
parentb84814b27956930411356a1bae13744f6c327e69 (diff)
parentc29f031598811486d83f418fd08fbfe1fc41788a (diff)
Merge "Fix for bug 6050753."
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
-rw-r--r--core/java/android/widget/FrameLayout.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java
index d019d8c7b428..1893620b58bb 100644
--- a/core/java/android/widget/FrameLayout.java
+++ b/core/java/android/widget/FrameLayout.java
@@ -603,6 +603,12 @@ public class FrameLayout extends ViewGroup {
*/
public int gravity = -1;
+ @Override
+ protected void setBaseAttributes(TypedArray a, int widthAttr, int heightAttr) {
+ width = a.getLayoutDimension(widthAttr, MATCH_PARENT);
+ height = a.getLayoutDimension(heightAttr, MATCH_PARENT);
+ }
+
/**
* {@inheritDoc}
*/