summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorClara Bayarri <clarabayarri@google.com>2015-04-07 12:52:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-07 12:52:31 +0000
commit9b8178719b4ff9058ddcc1c66e9416439b2348f0 (patch)
tree2c5ea70e76804ba20a2c45bc64156ff0a69eb494 /api
parent565b0f81ebf6a5a7b2ca859628fa0151b7f14dfb (diff)
parent0a26157a9f71fa4b26b88fc523b5809c64f6e7c9 (diff)
downloadframeworks_base-9b8178719b4ff9058ddcc1c66e9416439b2348f0.zip
frameworks_base-9b8178719b4ff9058ddcc1c66e9416439b2348f0.tar.gz
frameworks_base-9b8178719b4ff9058ddcc1c66e9416439b2348f0.tar.bz2
Merge "Create the Process Text Intent Action and Extra"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
-rw-r--r--api/system-current.txt3
2 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 7e24003..c6eff6c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8015,6 +8015,7 @@ package android.content {
field public static final java.lang.String ACTION_POWER_CONNECTED = "android.intent.action.ACTION_POWER_CONNECTED";
field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
+ field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
field public static final java.lang.String ACTION_REBOOT = "android.intent.action.REBOOT";
@@ -8115,6 +8116,8 @@ package android.content {
field public static final java.lang.String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
field public static final java.lang.String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";
field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";
diff --git a/api/system-current.txt b/api/system-current.txt
index 78b23ad..88892a3 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8235,6 +8235,7 @@ package android.content {
field public static final java.lang.String ACTION_POWER_CONNECTED = "android.intent.action.ACTION_POWER_CONNECTED";
field public static final java.lang.String ACTION_POWER_DISCONNECTED = "android.intent.action.ACTION_POWER_DISCONNECTED";
field public static final java.lang.String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY";
+ field public static final java.lang.String ACTION_PROCESS_TEXT = "android.intent.action.PROCESS_TEXT";
field public static final java.lang.String ACTION_PROVIDER_CHANGED = "android.intent.action.PROVIDER_CHANGED";
field public static final java.lang.String ACTION_QUERY_PACKAGE_RESTART = "android.intent.action.QUERY_PACKAGE_RESTART";
field public static final java.lang.String ACTION_QUICK_CLOCK = "android.intent.action.QUICK_CLOCK";
@@ -8340,6 +8341,8 @@ package android.content {
field public static final java.lang.String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";
field public static final java.lang.String EXTRA_PERMISSION_NAME = "android.intent.extra.PERMISSION_NAME";
field public static final java.lang.String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
+ field public static final java.lang.String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
field public static final java.lang.String EXTRA_REFERRER = "android.intent.extra.REFERRER";
field public static final java.lang.String EXTRA_REFERRER_NAME = "android.intent.extra.REFERRER_NAME";
field public static final java.lang.String EXTRA_REMOTE_INTENT_TOKEN = "android.intent.extra.remote_intent_token";