diff options
| author | Michael Chan <chanm@google.com> | 2012-06-18 11:50:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 11:50:03 -0700 |
| commit | 44e8cc54ee10f3dbbd7a00d01fbd2b9913f21b56 (patch) | |
| tree | 5f313ac50ada7e9d4279d289b71cc9b08c1103b1 /AndroidManifest.xml | |
| parent | 0c0515a9ff16d55d67138fc6e457ff304086ce66 (diff) | |
| parent | 6e354ae475cc765598b8520afa742c0a6541eb9d (diff) | |
| download | android_packages_apps_Calendar-44e8cc54ee10f3dbbd7a00d01fbd2b9913f21b56.tar.gz android_packages_apps_Calendar-44e8cc54ee10f3dbbd7a00d01fbd2b9913f21b56.tar.bz2 android_packages_apps_Calendar-44e8cc54ee10f3dbbd7a00d01fbd2b9913f21b56.zip | |
am 6e354ae4: am 877f5203: Merge "Add quick response when email guests in notification" into jb-dev
* commit '6e354ae475cc765598b8520afa742c0a6541eb9d':
Add quick response when email guests in notification
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 49841ae6..bb710f34 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -160,6 +160,10 @@ <activity android:name=".alerts.AlertActivity" android:launchMode="singleInstance" android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" /> + <activity android:name=".alerts.QuickResponseActivity" android:launchMode="singleInstance" + android:theme="@android:style/Theme.Holo.Dialog" android:excludeFromRecents="true" + android:label="@string/quick_response_dialog_title" /> + <receiver android:name=".alerts.AlertReceiver"> <intent-filter> <action android:name="android.intent.action.EVENT_REMINDER" /> |