diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-10-21 20:17:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-21 20:17:56 -0700 |
| commit | 101f14b275ab2451aef50dec427376d721d17aea (patch) | |
| tree | af8c333d1c2d519c300ab817991b74d51cee43b6 /core/res | |
| parent | 86f1b643d10e0b5b17ae01db3b81020db87b3295 (diff) | |
| parent | ba501785c7b298198d1c6e4787fd40e98f97da67 (diff) | |
| download | frameworks_base-101f14b275ab2451aef50dec427376d721d17aea.zip frameworks_base-101f14b275ab2451aef50dec427376d721d17aea.tar.gz frameworks_base-101f14b275ab2451aef50dec427376d721d17aea.tar.bz2 | |
am ba501785: Merge "Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE" into gingerbread
Merge commit 'ba501785c7b298198d1c6e4787fd40e98f97da67' into gingerbread-plus-aosp
* commit 'ba501785c7b298198d1c6e4787fd40e98f97da67':
Implement issue #3116702: New manifest tags for supported screen sizes DO NOT MERGE
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 32 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 34 insertions, 0 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 298463a..46a16fc 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -1425,6 +1425,38 @@ <attr name="functionalTest" /> </declare-styleable> + <!-- 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 + {@link #AndroidManifest manifest} tag. --> + <declare-styleable name="AndroidManifestCompatibleScreensScreen"> + <!-- Specifies a compatible screen size, as per the device + configuration screen size bins. --> + <attr name="screenSize"> + <!-- A small screen configuration, at least 240x320db. --> + <enum name="small" value="200" /> + <!-- A normal screen configuration, at least 320x480db. --> + <enum name="normal" value="300" /> + <!-- A large screen configuration, at least 400x530db. --> + <enum name="large" value="400" /> + <!-- An extra large screen configuration, at least 600x800db. --> + <enum name="xlarge" value="500" /> + </attr> + <!-- Specifies a compatible screen density, as per the device + configuration screen density bins. --> + <attr name="screenDensity" format="integer"> + <!-- A low density screen, approximately 120dpi. --> + <enum name="ldpi" value="120" /> + <!-- A medium density screen, approximately 160dpi. --> + <enum name="mdpi" value="160" /> + <!-- A high density screen, approximately 240dpi. --> + <enum name="hdpi" value="240" /> + <!-- An extra high density screen, approximately 320dpi. --> + <enum name="xhdpi" value="320" /> + </attr> + </declare-styleable> + + <!-- Declaration of an {@link android.content.Intent} object in XML. May also include zero or more {@link #IntentCategory <category> and {@link #Extra <extra>} tags. --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 5531d47..4005e96 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1260,6 +1260,8 @@ <public type="attr" name="textSelectHandle" id="0x010102c7" /> <public type="attr" name="textSelectHandleWindowStyle" id="0x010102c8" /> <public type="attr" name="popupAnimationStyle" id="0x010102c9" /> + <public type="attr" name="screenSize" id="0x010102ca" /> + <public type="attr" name="screenDensity" id="0x010102cb" /> <!-- presence drawables for videochat or audiochat capable contacts --> <public type="drawable" name="presence_video_away" id="0x010800ac" /> |