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

Commit ddad5593 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 752457ea e493a145

core/res/res/values/attrs.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -4518,7 +4518,7 @@ 
        <attr name="maxHeight" />

        <attr name="maxHeight" />

        <!-- Makes the TextView be exactly this many lines tall. -->

        <!-- Makes the TextView be exactly this many lines tall. -->

        <attr name="lines" format="integer" min="0" />

        <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

             You could get the same effect by specifying this number in the

             layout parameters. -->

             layout parameters. -->

        <attr name="height" format="dimension" />

        <attr name="height" format="dimension" />
@@ -4535,7 +4535,7 @@ 
        <attr name="maxWidth" />

        <attr name="maxWidth" />

        <!-- Makes the TextView be exactly this many ems wide. -->

        <!-- Makes the TextView be exactly this many ems wide. -->

        <attr name="ems" format="integer" min="0" />

        <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

             You could get the same effect by specifying this number in the

             layout parameters. -->

             layout parameters. -->

        <attr name="width" format="dimension" />

        <attr name="width" format="dimension" />