summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2013-09-05 18:15:57 -0700
committerMichael Wright <michaelwr@google.com>2013-09-05 18:15:57 -0700
commiteaeb19048672337714c1724de7992be8cb3f2124 (patch)
treeaca87c34e7933b08afe7a980a99a9b85bda10074 /core/res
parent56960fbd39706278dbcb9d6ee95e16fa6eff6c6e (diff)
downloadframeworks_base-eaeb19048672337714c1724de7992be8cb3f2124.zip
frameworks_base-eaeb19048672337714c1724de7992be8cb3f2124.tar.gz
frameworks_base-eaeb19048672337714c1724de7992be8cb3f2124.tar.bz2
Added support for supports-input manifest element
Change-Id: Ifa7c87908081585c1940b5a47fdf5138a287d9ea
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/attrs_manifest.xml23
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" />