diff options
| author | John Reck <jreck@google.com> | 2013-04-22 13:40:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-22 13:40:38 -0700 |
| commit | 871d0fde36284a5861174514544ea225459a0cb3 (patch) | |
| tree | f959edeaeb2f30227e4eb4d33ca5999faa9f43e8 | |
| parent | c7c101356aafb32b410b2ea7b505b31bd77fad82 (diff) | |
| parent | eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e (diff) | |
| download | android_packages_apps_Gallery2-871d0fde36284a5861174514544ea225459a0cb3.tar.gz android_packages_apps_Gallery2-871d0fde36284a5861174514544ea225459a0cb3.tar.bz2 android_packages_apps_Gallery2-871d0fde36284a5861174514544ea225459a0cb3.zip | |
am eeb5b71b: Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
* commit 'eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e':
Remove photos from gallery2 manifest
| -rw-r--r-- | AndroidManifest.xml | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 64cb3b994..040519dff 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -87,12 +87,8 @@ </intent-filter> </activity> - <activity - android:name="com.android.photos.GalleryActivity" - android:label="@string/app_name" - android:configChanges="keyboardHidden|orientation|screenSize" - android:theme="@style/Theme.Photos.Gallery" - android:uiOptions="splitActionBarWhenNarrow"> + <activity android:name="com.android.gallery3d.app.Gallery" android:label="@string/app_name" + android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.DEFAULT" /> @@ -125,18 +121,6 @@ <data android:mimeType="vnd.android.cursor.dir/image" /> <data android:mimeType="vnd.android.cursor.dir/video" /> </intent-filter> - </activity> - <activity - android:name="com.android.photos.AlbumActivity" - android:configChanges="keyboardHidden|orientation|screenSize" - android:theme="@style/Theme.Photos.Gallery" - android:uiOptions="splitActionBarWhenNarrow" - android:exported="false"> - </activity> - <activity - android:name="com.android.gallery3d.app.Gallery" - android:label="@string/app_name" - android:configChanges="keyboardHidden|orientation|screenSize"> <intent-filter> <action android:name="android.intent.action.VIEW" /> <category android:name="android.intent.category.DEFAULT" /> @@ -179,12 +163,16 @@ </intent-filter> </activity> - <activity android:name="com.android.photos.FullscreenViewer" - android:label="@string/app_name" + <!-- we add this activity-alias for shortcut backward compatibility --> + <!-- Note: The alias must put after the target activity --> + <activity-alias android:name="com.cooliris.media.Gallery" + android:targetActivity="com.android.gallery3d.app.Gallery" android:configChanges="keyboardHidden|orientation|screenSize" - android:theme="@style/Theme.Photos.Fullscreen" - android:parentActivityName="com.android.photos.GalleryActivity"> - </activity> + android:label="@string/app_name"> + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + </intent-filter> + </activity-alias> <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing media from attached MTP devices, like cameras and camera phones --> |