summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorAlan Lau <alanlau@google.com>2014-05-30 14:50:33 -0700
committerAlan Lau <alanlau@google.com>2014-06-02 17:17:23 +0000
commit07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d (patch)
tree66981b166b7183b94561bdbf938237f1ddb18b7c /AndroidManifest.xml
parent636a20a7276fd28f1ac682d10bf343161a1c5bc6 (diff)
downloadandroid_packages_apps_Email-07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d.tar.gz
android_packages_apps_Email-07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d.tar.bz2
android_packages_apps_Email-07e0bf5c74aaba7651deec64b5b7b8956a5e9d9d.zip
DO NOT MERGE Adding data to the pending intent for notification action. This is now needed
because Wear allows users to perform action on each conversation and therefore the pending intent can't be shared. Bug 15344221 Change-Id: Ib6d3f17ba64c1a8a14ab9abe56b2d8168c7b9558 (cherry picked from commit 10d73dbe18873bbea41608072544e251cb89d85c)
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b4cc0afbf..867f9098b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -715,6 +715,7 @@
<action android:name="com.android.mail.action.notification.REPLY" />
<action android:name="com.android.mail.action.notification.REPLY_ALL" />
<action android:name="com.android.mail.action.notification.FORWARD" />
+ <data android:scheme="content" />
</intent-filter>
</service>
<service android:name="com.android.mail.MailLogService">