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

Commit 0172264b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 294374bf: am 5e542108: Merge "Remove deprecation on android:enabled attribute."

* commit '294374bf':
  Remove deprecation on android:enabled attribute.
parents b4781b9b 294374bf
Loading
Loading
Loading
Loading
+6 −2
Original line number Original line Diff line number Diff line
@@ -3021,7 +3021,11 @@
             inputType attributes are found,  the inputType flags will override the value of
             inputType attributes are found,  the inputType flags will override the value of
             singleLine.) } -->
             singleLine.) } -->
        <attr name="singleLine" format="boolean" />
        <attr name="singleLine" format="boolean" />
        <!-- Specifies whether the TextView is enabled or not. {@deprecated Use state_enabled instead}. -->
        <!-- Specifies whether the widget is enabled. The interpretation of the enabled state varies by subclass.
             For example, a non-enabled EditText prevents the user from editing the contained text, and
             a non-enabled Button prevents the user from tapping the button. 
             The appearance of enabled and non-enabled widgets may differ, if the drawables referenced
             from evaluating state_enabled differ. -->
        <attr name="enabled" format="boolean" />
        <attr name="enabled" format="boolean" />
        <!-- If the text is selectable, select it all when the view takes
        <!-- If the text is selectable, select it all when the view takes
             focus instead of moving the cursor to the start or end. -->
             focus instead of moving the cursor to the start or end. -->
@@ -3052,7 +3056,7 @@
            <!-- Input is numeric. -->
            <!-- Input is numeric. -->
            <flag name="integer" value="0x01" />
            <flag name="integer" value="0x01" />
            <!-- Input is numeric, with sign allowed. -->
            <!-- Input is numeric, with sign allowed. -->
            <flag name="signed" value="0x003" />
            <flag name="signed" value="0x03" />
            <!-- Input is numeric, with decimals allowed. -->
            <!-- Input is numeric, with decimals allowed. -->
            <flag name="decimal" value="0x05" />
            <flag name="decimal" value="0x05" />
        </attr>
        </attr>