diff options
| author | Michael Wright <michaelwr@google.com> | 2013-09-05 18:31:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-05 18:31:04 -0700 |
| commit | f17e8ee37917103f1e6f96fd323605cd754dfdb3 (patch) | |
| tree | 68457de8e5b3b5579a49cf6f9be1a21747f3e5cc /core/res | |
| parent | 833384ba110a2310f5462df7a42749fc1ce78820 (diff) | |
| parent | 86974463e9e28108e14fa255efd3c429358c0605 (diff) | |
| download | frameworks_base-f17e8ee37917103f1e6f96fd323605cd754dfdb3.zip frameworks_base-f17e8ee37917103f1e6f96fd323605cd754dfdb3.tar.gz frameworks_base-f17e8ee37917103f1e6f96fd323605cd754dfdb3.tar.bz2 | |
am 86974463: Merge "Added support for supports-input manifest element" into klp-dev
* commit '86974463e9e28108e14fa255efd3c429358c0605':
Added support for supports-input manifest element
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 60ed0e5..05ca120 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1718,20 +1718,20 @@ <!-- Attributes that can be supplied in an AndroidManifest.xml <code>screen</code> tag, a child of <code>compatible-screens</code>, - which is itseld a child of the root + which is itself a child of the root {@link #AndroidManifest manifest} tag. --> <declare-styleable name="AndroidManifestCompatibleScreensScreen" parent="AndroidManifest.AndroidManifestCompatibleScreens"> <!-- Specifies a compatible screen size, as per the device configuration screen size bins. --> <attr name="screenSize"> - <!-- A small screen configuration, at least 240x320db. --> + <!-- A small screen configuration, at least 240x320dp. --> <enum name="small" value="200" /> - <!-- A normal screen configuration, at least 320x480db. --> + <!-- A normal screen configuration, at least 320x480dp. --> <enum name="normal" value="300" /> - <!-- A large screen configuration, at least 400x530db. --> + <!-- A large screen configuration, at least 400x530dp. --> <enum name="large" value="400" /> - <!-- An extra large screen configuration, at least 600x800db. --> + <!-- An extra large screen configuration, at least 600x800dp. --> <enum name="xlarge" value="500" /> </attr> <!-- Specifies a compatible screen density, as per the device @@ -1748,6 +1748,19 @@ </attr> </declare-styleable> + <!-- The <code>input-type</code> tag is a child of the <code>supports-input</code> tag, which + is itself a child of the root {@link #AndroidManifest manifest} tag. Each + <code>input-type</code> tag specifices the name of a specific input device type. When + grouped with the other elements of the parent <code>supports-input</code> tag it defines + a collection of input devices, which when all used together, are considered a supported + input mechanism for the application. There may be multiple <code>supports-input</code> + tags defined, each containing a different combination of input device types. --> + <declare-styleable name="AndroidManifestSupportsInputInputType" + parent="AndroidManifest.AndroidManifestSupportsInput"> + <!-- Specifices the name of the input device type --> + <attr name="name" /> + </declare-styleable> + <!-- The attribute that holds a Base64-encoded public key. --> <attr name="publicKey" format="string" /> |