Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo

Browse Source 
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken

* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
  doc change: cherry pick 75c66da209. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
This commit is contained in:
Dirk Dougherty
2010-04-01 10:47:00 -07:00
committed by Android Git Automerger
parent 85bc2ae1bb 865bd884e8
commit 7fb51bf546
3 changed files with 76 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/java/android/view/ViewGroup.java
View File

@@ -3457,11 +3457,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* The base LayoutParams class just describes how big the view wants to be * The base LayoutParams class just describes how big the view wants to be
* for both width and height. For each dimension, it can specify one of: * for both width and height. For each dimension, it can specify one of:
* <ul> * <ul>
* <li> an exact number * <li>FILL_PARENT (renamed MATCH_PARENT in API Level 8 and higher), which
* <li>MATCH_PARENT, which means the view wants to be as big as its parent * means that the view wants to be as big as its parent (minus padding)
* (minus padding)
* <li> WRAP_CONTENT, which means that the view wants to be just big enough * <li> WRAP_CONTENT, which means that the view wants to be just big enough
* to enclose its content (plus padding) * to enclose its content (plus padding)
* <li> an exact number
* </ul> * </ul>
* There are subclasses of LayoutParams for different subclasses of * There are subclasses of LayoutParams for different subclasses of
* ViewGroup. For example, AbsoluteLayout has its own subclass of * ViewGroup. For example, AbsoluteLayout has its own subclass of
@@ -3472,8 +3472,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
*/ */
public static class LayoutParams { public static class LayoutParams {
/** /**
* This value has the same meaning as {@link #MATCH_PARENT} but has * Special value for the height or width requested by a View.
* been deprecated. * FILL_PARENT means that the view wants to be as big as its parent,
* minus the parent's padding, if any. This value is deprecated
* starting in API Level 8 and replaced by {@link #MATCH_PARENT}.
*/ */
@SuppressWarnings({"UnusedDeclaration"}) @SuppressWarnings({"UnusedDeclaration"})
@Deprecated @Deprecated
@@ -3482,7 +3484,7 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
/** /**
* Special value for the height or width requested by a View. * Special value for the height or width requested by a View.
* MATCH_PARENT means that the view wants to be as big as its parent, * MATCH_PARENT means that the view wants to be as big as its parent,
* minus the parent's padding, if any. * minus the parent's padding, if any. Introduced in API Level 8.
*/ */
public static final int MATCH_PARENT = -1; public static final int MATCH_PARENT = -1;
@@ -3494,8 +3496,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
public static final int WRAP_CONTENT = -2; public static final int WRAP_CONTENT = -2;
/** /**
* Information about how wide the view wants to be. Can be an exact * Information about how wide the view wants to be. Can be one of the
* size, or one of the constants MATCH_PARENT or WRAP_CONTENT. * constants FILL_PARENT (replaced by MATCH_PARENT ,
* in API Level 8) or WRAP_CONTENT. or an exact size.
*/ */
@ViewDebug.ExportedProperty(mapping = { @ViewDebug.ExportedProperty(mapping = {
@ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"),
@@ -3504,8 +3507,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
public int width; public int width;
/** /**
* Information about how tall the view wants to be. Can be an exact * Information about how tall the view wants to be. Can be one of the
* size, or one of the constants MATCH_PARENT or WRAP_CONTENT. * constants FILL_PARENT (replaced by MATCH_PARENT ,
* in API Level 8) or WRAP_CONTENT. or an exact size.
*/ */
@ViewDebug.ExportedProperty(mapping = { @ViewDebug.ExportedProperty(mapping = {
@ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"), @ViewDebug.IntToString(from = MATCH_PARENT, to = "MATCH_PARENT"),
@@ -3525,9 +3529,11 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* *
* <ul> * <ul>
* <li><code>layout_width</code>: the width, either an exact value, * <li><code>layout_width</code>: the width, either an exact value,
* {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * {@link #WRAP_CONTENT}, or {@link #FILL_PARENT} (replaced by
* {@link #MATCH_PARENT} in API Level 8)</li>
* <li><code>layout_height</code>: the height, either an exact value, * <li><code>layout_height</code>: the height, either an exact value,
* {@link #WRAP_CONTENT} or {@link #MATCH_PARENT}</li> * {@link #WRAP_CONTENT}, or {@link #FILL_PARENT} (replaced by
* {@link #MATCH_PARENT} in API Level 8)</li>
* </ul> * </ul>
* *
* @param c the application environment * @param c the application environment
@@ -3546,10 +3552,12 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* Creates a new set of layout parameters with the specified width * Creates a new set of layout parameters with the specified width
* and height. * and height.
* *
* @param width the width, either {@link #MATCH_PARENT}, * @param width the width, either {@link #WRAP_CONTENT},
* {@link #WRAP_CONTENT} or a fixed size in pixels * {@link #FILL_PARENT} (replaced by {@link #MATCH_PARENT} in
* @param height the height, either {@link #MATCH_PARENT}, * API Level 8), or a fixed size in pixels
* {@link #WRAP_CONTENT} or a fixed size in pixels * @param height the height, either {@link #WRAP_CONTENT},
* {@link #FILL_PARENT} (replaced by {@link #MATCH_PARENT} in
* API Level 8), or a fixed size in pixels
*/ */
public LayoutParams(int width, int height) { public LayoutParams(int width, int height) {
this.width = width; this.width = width;

44
core/res/res/values/attrs.xml
View File

@@ -1396,9 +1396,12 @@
be a dimension (such as "12dip") for a constant width or one of be a dimension (such as "12dip") for a constant width or one of
the special constants. --> the special constants. -->
<attr name="layout_width" format="dimension"> <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" /> <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" /> <enum name="match_parent" value="-1" />
<!-- The view should be only big enough to enclose its content (plus padding). --> <!-- The view should be only big enough to enclose its content (plus padding). -->
<enum name="wrap_content" value="-2" /> <enum name="wrap_content" value="-2" />
@@ -1409,9 +1412,12 @@
be a dimension (such as "12dip") for a constant height or one of be a dimension (such as "12dip") for a constant height or one of
the special constants. --> the special constants. -->
<attr name="layout_height" format="dimension"> <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" /> <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" /> <enum name="match_parent" value="-1" />
<!-- The view should be only big enough to enclose its content (plus padding). --> <!-- The view should be only big enough to enclose its content (plus padding). -->
<enum name="wrap_content" value="-2" /> <enum name="wrap_content" value="-2" />
@@ -2128,27 +2134,35 @@
is used. --> is used. -->
<attr name="dropDownAnchor" format="reference" /> <attr name="dropDownAnchor" format="reference" />
<!-- Specifies the basic width of the dropdown. Its value may <!-- Specifies the basic width of the dropdown. Its value may
be a dimension (such as "12dip") for a constant width, match_parent be a dimension (such as "12dip") for a constant width,
to match the width of the screen, or wrap_content to match the width fill_parent or match_parent to match the width of the
of the anchored view. --> screen, or wrap_content to match the width of
the anchored view. -->
<attr name="dropDownWidth" format="dimension"> <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" /> <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" /> <enum name="match_parent" value="-1" />
<!-- The dropdown should fit the width of its anchor. --> <!-- The dropdown should fit the width of its anchor. -->
<enum name="wrap_content" value="-2" /> <enum name="wrap_content" value="-2" />
</attr> </attr>
<!-- Specifies the basic width of the dropdown. Its value may <!-- Specifies the basic height of the dropdown. Its value may
be a dimension (such as "12dip") for a constant width, match_parent be a dimension (such as "12dip") for a constant height,
to fill the width of the screen, or wrap_content to match the height of 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. --> the content of the drop down. -->
<attr name="dropDownHeight" format="dimension"> <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" /> <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" /> <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" /> <enum name="wrap_content" value="-2" />
</attr> </attr>
<attr name="inputType" /> <attr name="inputType" />

30
docs/html/guide/topics/ui/declaring-layout.jd
View File

@@ -200,15 +200,29 @@ view group defines layout parameters for each child view (including the child vi
values. Each child element must define LayoutParams that are appropriate for its parent, values. Each child element must define LayoutParams that are appropriate for its parent,
though it may also define different LayoutParams for its own children. </p> though it may also define different LayoutParams for its own children. </p>
<p>All view groups include a width and height (<code>layout_width</code> and <code>layout_height</code>), <p>All view groups include a width and height (<code>layout_width</code> and
and each view is required to define them. <code>layout_height</code>), and each view is required to define them. Many
Many LayoutParams also include optional margins and LayoutParams also include optional margins and borders. <p>
borders. You can specify width and height with exact measurements, though you probably won't want
to do this often. More often, you will tell your view to size itself either to <p>You can specify width and height with exact measurements, though you probably
the dimensions required by its content, or to become as big as its parent view group won't want to do this often. More often, you will use one of these constants to
will allow (with the <var>wrap_content</var> and <var>fill_parent</var> values, respectively). set the width or height: </p>
<ul>
<li><var>wrap_content</var> tells your view to size itself to the dimensions
required by its content</li>
<li><var>fill_parent</var> (renamed <var>match_parent</var> in API Level 8)
tells your view to become as big as its parent view group will allow.</li>
</ul>
<p>In general, specifying a layout width and height using absolute units such as
pixels is not recommended. Instead, using relative measurements such as
density-independent pixel units (<var>dp</var>), <var>wrap_content</var>, or
<var>fill_parent</var>, is a better approach, because it helps ensure that
your application will display properly across a variety of device screen sizes.
The accepted measurement types are defined in the The accepted measurement types are defined in the
<a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">Available Resources</a> document.</p> <a href="{@docRoot}guide/topics/resources/available-resources.html#dimension">
Available Resources</a> document.</p>
<h2 id="Position">Layout Position</h2> <h2 id="Position">Layout Position</h2>