diff options
| author | 2012-10-11 19:23:06 -0700 | |
|---|---|---|
| committer | 2012-10-11 19:23:07 -0700 | |
| commit | a3f33309d7464a7ccca76b0475e2dfd009956e49 (patch) | |
| tree | e113508e29eb25c76825f4cfe16ab28a50c56a10 | |
| parent | b746febca2e3f21704556647cd987fdf902fb779 (diff) | |
| parent | 39944808b53a03ae79886389996c5ea83346a45b (diff) | |
Merge "DOCUMENTATION ONLY: try to clarify gravity vs layout_gravity" into jb-mr1-dev
| -rwxr-xr-x | core/res/res/values/attrs.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 9ce7f8a9cef7..384f1abe3659 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -1197,8 +1197,8 @@ <!-- A coordinate in the Y dimension. --> <attr name="y" format="dimension" /> - <!-- Specifies how to place the content of an object, both - on the x- and y-axis, within the object itself. --> + <!-- Specifies how an object should position its content, on both the X and Y axes, + within its own bounds. --> <attr name="gravity"> <!-- Push object to the top of its container, not changing its size. --> <flag name="top" value="0x30" /> @@ -1257,8 +1257,8 @@ <!-- Reference to an array resource that will populate a list/adapter. --> <attr name="entries" format="reference" /> - <!-- Standard gravity constant that a child can supply to its parent. - Defines how to place the view, both its x- and y-axis, within its parent view group. --> + <!-- Standard gravity constant that a child supplies to its parent. + Defines how the child view should be positioned, on both the X and Y axes, within its enclosing layout. --> <attr name="layout_gravity"> <!-- Push object to the top of its container, not changing its size. --> <flag name="top" value="0x30" /> |