diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-10-25 19:25:14 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-25 19:25:14 -0700 |
| commit | 36bf474b59038adbdcf0b50aed132baf31d40fd1 (patch) | |
| tree | 709eca43c65fef8d1d284772eff66ba38675dd73 | |
| parent | 0ac9150d436b33b21ac458ae3015791c1fd8e2d5 (diff) | |
| parent | 0ecb18d32ebf2fc7db3f054d074cb9b49bfdaad6 (diff) | |
| download | Calendar-36bf474b59038adbdcf0b50aed132baf31d40fd1.tar.gz | |
Merge "Revert "Calendar: Drop no longer existing activity from manifest"" am: 623f47500c
am: 0ecb18d32e
Change-Id: Iff5261211e650418124d085bdb549802fc4809f8
| -rw-r--r-- | AndroidManifest.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f6f9ed28..1e78c72e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -94,6 +94,27 @@ android:value="com.android.calendar.AllInOneActivity" /> </activity> + <activity android:name=".event.EditEventActivity" + android:theme="@style/CalendarTheme.WithActionBar"> + </activity> + + <activity-alias android:name="EditEventActivity" + android:targetActivity=".event.EditEventActivity" + android:exported="true"> + <intent-filter> + <action android:name="android.intent.action.EDIT" /> + <action android:name="android.intent.action.INSERT" /> + <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" /> + <action android:name="android.intent.action.INSERT" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:mimeType="vnd.android.cursor.dir/event" /> + </intent-filter> + </activity-alias> + <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label" android:theme="@android:style/Theme.NoDisplay" android:configChanges="orientation|keyboardHidden"> |