diff options
| author | Jim Miller <jaggies@google.com> | 2012-10-16 19:01:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-16 19:01:32 -0700 |
| commit | dcf59629beed8182759a1068ab8ee997935bef82 (patch) | |
| tree | 732179c3ca4004019fca094e81bd42a234f1cafb /core/java/android/widget/FrameLayout.java | |
| parent | 6868d6f349610c15256471cc3d5fa708cbfd5f1d (diff) | |
This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
Revert "Revert "Revert "Fix for bug 6050753."""
This reverts commit 6868d6f349610c15256471cc3d5fa708cbfd5f1d
Change-Id: I8843d92dba14c82f06d9ee59517cf11b2abbbf04
Diffstat (limited to 'core/java/android/widget/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 45f30df7b40d..e15877640758 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -608,12 +608,6 @@ 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} */ |