summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-03-25 16:33:33 -0700
committerDirk Dougherty <ddougherty@google.com>2010-04-01 09:16:08 -0700
commit3d5f648f8fe61507107b900fc3c4cf79b19572c6 (patch)
tree61d1eab1da0ff8baa35b214912a1d5786af64aa8 /core/res
parent352cf1a45e26803a466d096ca2d679ea5a3ac249 (diff)
downloadframeworks_base-3d5f648f8fe61507107b900fc3c4cf79b19572c6.zip
frameworks_base-3d5f648f8fe61507107b900fc3c4cf79b19572c6.tar.gz
frameworks_base-3d5f648f8fe61507107b900fc3c4cf79b19572c6.tar.bz2
doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Change-Id: I1d2b80b8dc3f8b2e3c1befcbb7c4c522d78a2db8
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/attrs.xml44
1 files changed, 29 insertions, 15 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 24808ec..16b241b 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -1396,9 +1396,12 @@
be a dimension (such as "12dip") for a constant width or one of
the special constants. -->
<attr name="layout_width" format="dimension">
- <!-- <strong>Deprecated.</strong> Use {@code match_parent} instead. -->
+ <!-- The view should be as big as its parent (minus padding).
+ This constant is deprecated starting from API Level 8 and
+ is replaced by {@code match_parent}. -->
<enum name="fill_parent" value="-1" />
- <!-- The view should be as big as its parent (minus padding). -->
+ <!-- The view should be as big as its parent (minus padding).
+ Introduced in API Level 8. -->
<enum name="match_parent" value="-1" />
<!-- The view should be only big enough to enclose its content (plus padding). -->
<enum name="wrap_content" value="-2" />
@@ -1409,9 +1412,12 @@
be a dimension (such as "12dip") for a constant height or one of
the special constants. -->
<attr name="layout_height" format="dimension">
- <!-- <strong>Deprecated.</strong> Use {@code match_parent} instead. -->
+ <!-- The view should be as big as its parent (minus padding).
+ This constant is deprecated starting from API Level 8 and
+ is replaced by {@code match_parent}. -->
<enum name="fill_parent" value="-1" />
- <!-- The view should be as big as its parent (minus padding). -->
+ <!-- The view should be as big as its parent (minus padding).
+ Introduced in API Level 8. -->
<enum name="match_parent" value="-1" />
<!-- The view should be only big enough to enclose its content (plus padding). -->
<enum name="wrap_content" value="-2" />
@@ -2128,27 +2134,35 @@
is used. -->
<attr name="dropDownAnchor" format="reference" />
<!-- Specifies the basic width of the dropdown. Its value may
- be a dimension (such as "12dip") for a constant width, match_parent
- to match the width of the screen, or wrap_content to match the width
- of the anchored view. -->
+ be a dimension (such as "12dip") for a constant width,
+ fill_parent or match_parent to match the width of the
+ screen, or wrap_content to match the width of
+ the anchored view. -->
<attr name="dropDownWidth" format="dimension">
- <!-- <strong>Deprecated.</strong> Use {@code match_parent} instead. -->
+ <!-- The dropdown should fill the width of the screen.
+ This constant is deprecated starting from API Level 8 and
+ is replaced by {@code match_parent}. -->
<enum name="fill_parent" value="-1" />
- <!-- The dropdown should fit the width of the screen. -->
+ <!-- The dropdown should fit the width of the screen.
+ Introduced in API Level 8. -->
<enum name="match_parent" value="-1" />
<!-- The dropdown should fit the width of its anchor. -->
<enum name="wrap_content" value="-2" />
</attr>
- <!-- Specifies the basic width of the dropdown. Its value may
- be a dimension (such as "12dip") for a constant width, match_parent
- to fill the width of the screen, or wrap_content to match the height of
+ <!-- Specifies the basic height of the dropdown. Its value may
+ be a dimension (such as "12dip") for a constant height,
+ fill_parent or match_parent to fill the height of the
+ screen, or wrap_content to match the height of
the content of the drop down. -->
<attr name="dropDownHeight" format="dimension">
- <!-- <strong>Deprecated.</strong> Use {@code match_parent} instead. -->
+ <!-- The dropdown should fit the height of the screen.
+ This constant is deprecated starting from API Level 8 and
+ is replaced by {@code match_parent}. -->
<enum name="fill_parent" value="-1" />
- <!-- The dropdown should fill the width of the screen. -->
+ <!-- The dropdown should fit the height of the screen.
+ Introduced in API Level 8. -->
<enum name="match_parent" value="-1" />
- <!-- The dropdown should fit the width of its anchor. -->
+ <!-- The dropdown should fit the height of the content. -->
<enum name="wrap_content" value="-2" />
</attr>
<attr name="inputType" />