summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJoe Onorato <joeo@android.com>2009-12-02 22:40:57 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-12-02 22:40:57 -0800
commitb28632a5206d11844db39ca1ab5f64a99ec74e29 (patch)
tree9d435d4664acc8724993de0ad8045b645d503da2 /api
parent780211a9a792dcc4cd57df0a4e8da34d05eb99f1 (diff)
parentc7a63eea8d3d346addaaf892b5bbe0aa80651640 (diff)
downloadframeworks_base-b28632a5206d11844db39ca1ab5f64a99ec74e29.zip
frameworks_base-b28632a5206d11844db39ca1ab5f64a99ec74e29.tar.gz
frameworks_base-b28632a5206d11844db39ca1ab5f64a99ec74e29.tar.bz2
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 'c7a63eea8d3d346addaaf892b5bbe0aa80651640' into eclair-mr2 * commit 'c7a63eea8d3d346addaaf892b5bbe0aa80651640': 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 7057866..027bc1b 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -34032,6 +34032,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"
@@ -34843,6 +34854,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"
@@ -36423,6 +36447,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"
@@ -62109,6 +62144,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"
@@ -62335,6 +62381,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"