Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18e375e authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev 

am: ddad5593

Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559
parents 8590d905 ddad5593

core/res/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -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" />