summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-05-05 15:57:42 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-05-05 15:57:42 -0700
commitf78964490d8098387d51444c87bf520ad3f674e2 (patch)
tree7384d69f165ea9a1d1a004a54b05155d29f1249e /api
parentfc12b5be2ee49ba2392274d413bd5d759c03c346 (diff)
parent1e936da287e1836502bf91b53468076726b7e1ee (diff)
downloadframeworks_base-f78964490d8098387d51444c87bf520ad3f674e2.zip
frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.gz
frameworks_base-f78964490d8098387d51444c87bf520ad3f674e2.tar.bz2
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Diffstat (limited to 'api')
-rw-r--r--api/current.xml22
1 files changed, 22 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 66f924f..a0042d1 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -169696,6 +169696,17 @@
visibility="public"
>
</field>
+<field name="KEYCODE_PICTSYMBOLS"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="94"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="KEYCODE_PLUS"
type="int"
transient="false"
@@ -169872,6 +169883,17 @@
visibility="public"
>
</field>
+<field name="KEYCODE_SWITCH_CHARSET"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="95"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="KEYCODE_SYM"
type="int"
transient="false"