diff options
author | Isaac Katzenelson <isaack@android.com> | 2012-05-02 16:46:44 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 16:46:44 -0700 |
commit | 21e815bd1dc21ba9951ce703b3808e16e3bf85cf (patch) | |
tree | 74a7483d3e64aae9dc1a6408a3e7fe2c38c57858 /AndroidManifest.xml | |
parent | 828df5020067aa477adbe1eefd88afa3fc5de900 (diff) | |
download | android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.tar.gz android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.tar.bz2 android_packages_apps_Calendar-21e815bd1dc21ba9951ce703b3808e16e3bf85cf.zip |
Revert "Fix back and home behavior"
This reverts commit 828df5020067aa477adbe1eefd88afa3fc5de900
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8b3e1bbb..c9b6413e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,6 +67,11 @@ <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" @@ -75,17 +80,11 @@ </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" |