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/FrameLayout.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/FrameLayout.java')
| -rw-r--r-- | core/java/android/widget/FrameLayout.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index e15877640758..45f30df7b40d 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -608,6 +608,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} */ |