From 0ef732f240516f9f8b8add982f82244e01ec509b Mon Sep 17 00:00:00 2001
From: Isaac Katzenelson <isaack@android.com>
Date: Thu, 26 Apr 2012 17:39:14 -0700
Subject: Fix back and home behavior

Change-Id: I9b6085a73043d8d05d99cbfcbc20a8be4f58180d
---
 AndroidManifest.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'AndroidManifest.xml')

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"
-- 
cgit v1.2.3