diff options
| author | Dianne Hackborn <hackbod@android.com> | 2012-04-24 13:50:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-24 13:50:24 -0700 |
| commit | dc5f9b75302c76fb9d537caa1131fa0cbba2b682 (patch) | |
| tree | 259e1e5b169b904eee4d2ce9cb42cdf0e2013b62 /core/res | |
| parent | d6bdbb8da14f0162281ce18ce7573a6c5a15b04e (diff) | |
| parent | 0172264bda0b3b018815cb4cdf26b00ccb7d7fe5 (diff) | |
| download | frameworks_base-dc5f9b75302c76fb9d537caa1131fa0cbba2b682.zip frameworks_base-dc5f9b75302c76fb9d537caa1131fa0cbba2b682.tar.gz frameworks_base-dc5f9b75302c76fb9d537caa1131fa0cbba2b682.tar.bz2 | |
am 0172264b: am 294374bf: am 5e542108: Merge "Remove deprecation on android:enabled attribute."
* commit '0172264bda0b3b018815cb4cdf26b00ccb7d7fe5':
Remove deprecation on android:enabled attribute.
Diffstat (limited to 'core/res')
| -rwxr-xr-x | core/res/res/values/attrs.xml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index aa47993..0ac381d 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -3105,7 +3105,11 @@ inputType attribute instead for editable text views (if both singleLine and inputType are supplied, the inputType flags will override the value of singleLine). } --> <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" /> <!-- If the text is selectable, select it all when the view takes focus. --> @@ -3136,7 +3140,7 @@ <!-- Input is numeric. --> <flag name="integer" value="0x01" /> <!-- Input is numeric, with sign allowed. --> - <flag name="signed" value="0x003" /> + <flag name="signed" value="0x03" /> <!-- Input is numeric, with decimals allowed. --> <flag name="decimal" value="0x05" /> </attr> |