commit 5f62079ab9daefe95ede87631766e99e8b4a2220
author Erik <roboerik@android.com> Wed Oct 27 12:42:01 2010 -0700
committer Erik <roboerik@android.com> Wed Nov 03 11:48:00 2010 -0700
tree 908066a98df0fdd158f421f690445f54ac07ed89
parent 6191c1204b1ac68f4aa4041757a38e0a11a92677

Moves Edit Event back into an activity

Also updates the permissions for adding reminders to events and
fixes b/3125518, b/2976280, and b/3023359.

TODO Check exceptions to see if they haven't been synced yet
before allowing them to be edited.

Change-Id: I0fe7777d69d61da6cc17b4a0714ed020bd2fc1d6

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d2c3879..470d7eb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,11 +61,24 @@
                 <data android:host="com.android.calendar" />
                 <data android:scheme="content"/>
             </intent-filter>
+        </activity-alias>
+
+        <activity android:name=".event.EditEventActivity"
+            android:theme="@style/CalendarTheme.WithActionBar">
+        </activity>
+
+        <activity-alias android:name="EditEventActivity"
+            android:targetActivity=".event.EditEventActivity">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:mimeType="vnd.android.cursor.item/event" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/event" />
+            </intent-filter>
         </activity-alias>
 
         <activity android:name="EventInfoActivity" android:label="@string/event_info_title"