diff options
| author | Isaac Katzenelson <isaack@android.com> | 2012-04-26 17:39:14 -0700 |
|---|---|---|
| committer | Isaac Katzenelson <isaack@android.com> | 2012-05-02 14:34:58 -0700 |
| commit | 828df5020067aa477adbe1eefd88afa3fc5de900 (patch) | |
| tree | 0d17e2b64e9bddcd170aa25c8bf6be19cde83e48 /AndroidManifest.xml | |
| parent | 00fb1f480c1e3eeb85535c9770e90ace76b2fa9e (diff) | |
| download | android_packages_apps_Calendar-828df5020067aa477adbe1eefd88afa3fc5de900.tar.gz android_packages_apps_Calendar-828df5020067aa477adbe1eefd88afa3fc5de900.tar.bz2 android_packages_apps_Calendar-828df5020067aa477adbe1eefd88afa3fc5de900.zip | |
Fix back and home behavior
Change-Id: Ib4a873ce4727d21a4407635f943300bacc88daca
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c9b6413e..8b3e1bbb 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,11 +67,6 @@ <data android:host="com.android.calendar" /> <data android:scheme="content"/> </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - <category android:name="android.intent.category.DEFAULT" /> - <data android:mimeType="vnd.android.cursor.item/event" /> - </intent-filter> </activity> <activity-alias android:name="LaunchActivity" @@ -80,11 +75,17 @@ </activity-alias> <activity android:name="EventInfoActivity" + android:parentActivityName="com.android.calendar.AllInOneActivity" android:theme="@style/CalendarTheme.WithActionBar"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="vnd.android.cursor.item/event" /> + </intent-filter> </activity> <activity android:name=".event.EditEventActivity" |