diff options
| author | Raman Tenneti <rtenneti@google.com> | 2019-10-25 19:42:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-25 19:42:42 -0700 |
| commit | c4c16af6d98886807ecedad53207ba13d14532d2 (patch) | |
| tree | 2b63f6bf28f275bc1771b3ec4ffdf9b35b77a6b8 | |
| parent | 0680ef04c217999e40bd9f822b6b2732ad048cfd (diff) | |
| parent | 3c88150d90f378cbe067da7e89389b15a5cb35a4 (diff) | |
| download | Calendar-c4c16af6d98886807ecedad53207ba13d14532d2.tar.gz | |
Merge "Revert "Calendar: Drop no longer existing activity from manifest"" am: 623f47500c am: 0ecb18d32e am: 36bf474b59
am: 3c88150d90
Change-Id: If73a96bae39de75d91f13176d6b8a82cf698cd5a
| -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"> |