summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorEvan Millar <emillar@google.com>2009-11-20 14:40:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-20 14:40:07 -0800
commite4ecccd8b1a93fd628260b741613a9a5bc91bead (patch)
tree559670dd461615f94e07a2e1b05962ba6e80e800 /api
parent8914a04b16791cda98de88b5f94d9fee3acedfca (diff)
parente1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3 (diff)
downloadframeworks_base-e4ecccd8b1a93fd628260b741613a9a5bc91bead.zip
frameworks_base-e4ecccd8b1a93fd628260b741613a9a5bc91bead.tar.gz
frameworks_base-e4ecccd8b1a93fd628260b741613a9a5bc91bead.tar.bz2
am e1e5ff37: am 288509a9: am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3' * commit 'e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3': Move updated 6.xml from eclair-sholes-release into eclair
Diffstat (limited to 'api')
-rw-r--r--api/6.xml70
1 files changed, 70 insertions, 0 deletions
diff --git a/api/6.xml b/api/6.xml
index 74c2375..a4103fd 100644
--- a/api/6.xml
+++ b/api/6.xml
@@ -6389,6 +6389,72 @@
visibility="public"
>
</field>
+<field name="quickContactBadgeStyleSmallWindowLarge"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843443"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleSmallWindowMedium"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843442"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleSmallWindowSmall"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843441"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowLarge"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843440"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowMedium"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843439"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="quickContactBadgeStyleWindowSmall"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843438"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="radioButtonStyle"
type="int"
transient="false"
@@ -13804,6 +13870,8 @@
</parameter>
<parameter name="options" type="android.os.Bundle">
</parameter>
+<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
+</exception>
</method>
<method name="editProperties"
return="android.os.Bundle"
@@ -13919,6 +13987,8 @@
</parameter>
<parameter name="loginOptions" type="android.os.Bundle">
</parameter>
+<exception name="NetworkErrorException" type="android.accounts.NetworkErrorException">
+</exception>
</method>
</class>
<class name="Account"