summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-21 20:17:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-21 20:17:56 -0700
commit101f14b275ab2451aef50dec427376d721d17aea (patch)
treeaf8c333d1c2d519c300ab817991b74d51cee43b6 /api
parent86f1b643d10e0b5b17ae01db3b81020db87b3295 (diff)
parentba501785c7b298198d1c6e4787fd40e98f97da67 (diff)
downloadframeworks_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 'api')
-rw-r--r--api/current.xml33
1 files changed, 33 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 98113bc..4cf8b65 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -6961,6 +6961,17 @@
visibility="public"
>
</field>
+<field name="screenDensity"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843467"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="screenOrientation"
type="int"
transient="false"
@@ -6972,6 +6983,17 @@
visibility="public"
>
</field>
+<field name="screenSize"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843466"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="scrollHorizontally"
type="int"
transient="false"
@@ -174756,6 +174778,17 @@
visibility="public"
>
</field>
+<field name="DENSITY_XHIGH"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="320"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="density"
type="float"
transient="false"