summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-04-19 21:51:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-19 21:51:57 +0000
commiteeb5b71b03dbe1b6e43528bdeafe1cc23089be0e (patch)
treef2a7d5e14893ceac72d54e2f309ecfefd6b70cba
parentbeba6b1c36f79aded98f71dbf45454dd947ce7b8 (diff)
parent93074e91a15a926c079a40d7bc86025d5297259b (diff)
downloadandroid_packages_apps_Gallery2-eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e.zip
android_packages_apps_Gallery2-eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e.tar.gz
android_packages_apps_Gallery2-eeb5b71b03dbe1b6e43528bdeafe1cc23089be0e.tar.bz2
Merge "Remove photos from gallery2 manifest" into gb-ub-photos-bryce
-rw-r--r--AndroidManifest.xml34
1 files changed, 11 insertions, 23 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64cb3b9..040519d 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 -->