Reconcile with jb-mr2-release - do not merge

[android-x86/packages-apps-Gallery2.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 64cb3b9..02ffcc1 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40010"
-        android:versionName="1.1.40010"
+<manifest android:versionCode="40012"
+        android:versionName="1.1.40012"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 
@@ -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 -->
@@ -296,19 +284,6 @@
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Gallery.Dialog"/>
 
-        <activity android:name="com.android.camera.NewCameraActivity"
-                android:taskAffinity="com.android.camera.NewCameraActivity"
-                android:theme="@style/Theme.Camera"
-                android:label="@string/camera_label"
-                android:configChanges="orientation|screenSize|keyboardHidden"
-                android:clearTaskOnLaunch="true"
-                android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
         <activity android:name="com.android.camera.CameraActivity"
                 android:taskAffinity="com.android.camera.CameraActivity"
                 android:label="@string/camera_label"