summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-12-03 10:51:34 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-03 10:51:34 -0800
commit8da7873f94d5a3722b5bb2dd73d51377ce3dff8a (patch)
tree2845b1f74f437a763a4f6063c6025df0f19b7170 /api
parent37416c44c09600750a907f84c90d3f8d762c0fdf (diff)
parentdbed53504f515337ccc2f60248bb589dff0f24fb (diff)
downloadframeworks_base-8da7873f94d5a3722b5bb2dd73d51377ce3dff8a.zip
frameworks_base-8da7873f94d5a3722b5bb2dd73d51377ce3dff8a.tar.gz
frameworks_base-8da7873f94d5a3722b5bb2dd73d51377ce3dff8a.tar.bz2
am dbed5350: am b28632a5: am c7a63eea: Add a new field to Intent that allows you to give a hint about what on screen caused the intent to be sent.
Merge commit 'dbed53504f515337ccc2f60248bb589dff0f24fb' * commit 'dbed53504f515337ccc2f60248bb589dff0f24fb': Add a new field to Intent that allows you to give a hint about what on screen caused the intent to
Diffstat (limited to 'api')
-rw-r--r--api/current.xml59
1 files changed, 59 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml
index 761d6c1..d530c34 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -34043,6 +34043,17 @@
<parameter name="defaultValue" type="short">
</parameter>
</method>
+<method name="getSourceBounds"
+ return="android.graphics.Rect"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getStringArrayExtra"
return="java.lang.String[]"
abstract="false"
@@ -34854,6 +34865,19 @@
<parameter name="packageName" type="java.lang.String">
</parameter>
</method>
+<method name="setSourceBounds"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="r" type="android.graphics.Rect">
+</parameter>
+</method>
<method name="setType"
return="android.content.Intent"
abstract="false"
@@ -36434,6 +36458,17 @@
visibility="public"
>
</field>
+<field name="FILL_IN_SOURCE_BOUNDS"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="32"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="FLAG_ACTIVITY_BROUGHT_TO_FRONT"
type="int"
transient="false"
@@ -62120,6 +62155,17 @@
visibility="public"
>
</method>
+<method name="flattenToString"
+ return="java.lang.String"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="height"
return="int"
abstract="false"
@@ -62346,6 +62392,19 @@
visibility="public"
>
</method>
+<method name="unflattenFromString"
+ return="android.graphics.Rect"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="true"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="str" type="java.lang.String">
+</parameter>
+</method>
<method name="union"
return="void"
abstract="false"