diff options
| author | 2017-10-30 18:02:54 +0000 | |
|---|---|---|
| committer | 2017-10-30 18:02:54 +0000 | |
| commit | d18e375ece52aa0bf451a2e443afbe3e00037a0e (patch) | |
| tree | c5ca92887e1297bf5e4cb0313ca437a440f4c16a | |
| parent | 8590d905cb185b5b055ec122745bb02ad6c6b6ef (diff) | |
| parent | ddad5593c2429e7b3d9f793ae94fc52070744f96 (diff) | |
Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev
am: ddad5593c2
Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 42f540b6a031..0e879cd09b6c 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -4518,7 +4518,7 @@ <attr name="maxHeight" /> <!-- Makes the TextView be exactly this many lines tall. --> <attr name="lines" format="integer" min="0" /> - <!-- Makes the TextView be exactly this many pixels tall. + <!-- Makes the TextView be exactly this tall. You could get the same effect by specifying this number in the layout parameters. --> <attr name="height" format="dimension" /> @@ -4535,7 +4535,7 @@ <attr name="maxWidth" /> <!-- Makes the TextView be exactly this many ems wide. --> <attr name="ems" format="integer" min="0" /> - <!-- Makes the TextView be exactly this many pixels wide. + <!-- Makes the TextView be exactly this wide. You could get the same effect by specifying this number in the layout parameters. --> <attr name="width" format="dimension" /> |