summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-04-19 10:04:12 -0700
committerJohn Reck <jreck@google.com>2013-04-19 14:12:55 -0700
commit93074e91a15a926c079a40d7bc86025d5297259b (patch)
treec0d189d945e36b511145282cb51123ad6524fb3c /AndroidManifest.xml
parent316af8dd675d777f4bd9512b8af5391c7c89363f (diff)
downloadandroid_packages_apps_Gallery2-93074e91a15a926c079a40d7bc86025d5297259b.zip
android_packages_apps_Gallery2-93074e91a15a926c079a40d7bc86025d5297259b.tar.gz
android_packages_apps_Gallery2-93074e91a15a926c079a40d7bc86025d5297259b.tar.bz2
Remove photos from gallery2 manifest
Bug: 8659787 Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
Diffstat (limited to 'AndroidManifest.xml')
-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 -->