From 93074e91a15a926c079a40d7bc86025d5297259b Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Fri, 19 Apr 2013 10:04:12 -0700
Subject: Remove photos from gallery2 manifest

 Bug: 8659787

Change-Id: I72c85db38b3f7409a2ce84b2a6a7b7ccab41a351
---
 AndroidManifest.xml | 34 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 23 deletions(-)

(limited to 'AndroidManifest.xml')

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 -->
-- 
cgit v1.2.3