diff options
author | Michael Chan <mchan@android.com> | 2010-12-10 14:12:57 -0800 |
---|---|---|
committer | Michael Chan <mchan@android.com> | 2010-12-10 14:32:47 -0800 |
commit | 2c7c851a4e40afa83a741ec39d44425b705a712e (patch) | |
tree | 70b4216a70d7eb3cd39888ac0b6943f1a9c31761 /AndroidManifest.xml | |
parent | 7a30aa9ff4f599a31e18833925211716b62a64eb (diff) | |
download | android_packages_apps_Calendar-2c7c851a4e40afa83a741ec39d44425b705a712e.tar.gz android_packages_apps_Calendar-2c7c851a4e40afa83a741ec39d44425b705a712e.tar.bz2 android_packages_apps_Calendar-2c7c851a4e40afa83a741ec39d44425b705a712e.zip |
b/3189042 Handle ACTION_VIEW in AllInOne. Removed EventInfoActivity.
Change-Id: Ic00300e5d48d264ade7d400d703cba8f5a2b8626
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b100caac..2b8fd29c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -65,6 +65,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-alias> <activity android:name=".event.EditEventActivity" @@ -85,17 +90,6 @@ </intent-filter> </activity-alias> - <activity android:name="EventInfoActivity" android:label="@string/event_info_title" - android:theme="@style/CalendarTheme.WithActionBar" - android:configChanges="orientation|keyboardHidden"> - - <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="GoogleCalendarUriIntentFilter" android:label="@string/app_label" android:theme="@android:style/Theme.Light" android:configChanges="orientation|keyboardHidden"> |