am 7dc5b6b3: Merge "Refactoring iconbutton." into gb-ub-photos-bryce

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca62d8a..8d28a7c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<manifest android:versionCode="40002"
-        android:versionName="1.1.40002"
+<manifest android:versionCode="40004"
+        android:versionName="1.1.40004"
         xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.android.gallery3d">
 
@@ -88,7 +88,8 @@
              </intent-filter>
         </activity>
 
-        <activity android:name="com.android.photos.GalleryActivity"
+        <activity
+                android:name="com.android.photos.GalleryActivity"
                 android:label="@string/app_name"
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:theme="@style/Theme.Photos.Gallery"
@@ -111,6 +112,25 @@
                 <data android:mimeType="image/*" />
                 <data android:mimeType="video/*" />
             </intent-filter>
+            <!-- We do NOT support the PICK intent, we add these intent-filter for
+                 backward compatibility. Handle it as GET_CONTENT. -->
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="image/*" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PICK" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="vnd.android.cursor.dir/image" />
+                <data android:mimeType="vnd.android.cursor.dir/video" />
+            </intent-filter>
+        </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" />
@@ -151,20 +171,13 @@
                 <data android:mimeType="video/3gpp2" />
                 <data android:mimeType="application/sdp" />
             </intent-filter>
-            <!-- We do NOT support the PICK intent, we add these intent-filter for
-                 backward compatibility. Handle it as GET_CONTENT. -->
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:mimeType="image/*" />
-                <data android:mimeType="video/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PICK" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <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.FullscreenViewer"
+                android:label="@string/app_name"
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:theme="@style/Theme.Photos.Fullscreen"
+                android:parentActivityName="com.android.photos.GalleryActivity">
         </activity>
 
          <!-- This activity receives USB_DEVICE_ATTACHED intents and allows importing
@@ -387,29 +400,5 @@
         </activity>
         <service android:name="com.android.gallery3d.app.BatchService" />
         <service android:name="com.android.camera.MediaSaveService" />
-
-        <!-- canvas -->
-        <provider
-            android:name="com.android.photos.canvas.CanvasProvider"
-            android:authorities="com.android.gallery3d.provider.CanvasProvider"
-            android:exported="true"
-            android:label="@string/app_name"
-            android:permission="android.permission.ACCESS_APP_BROWSE_DATA" />
-        <activity android:name="com.android.photos.canvas.EnableSyncActivity"
-                android:exported="true"
-                android:theme="@style/Theme.ProxyLauncher">
-        </activity>
-        <activity android:name="com.android.photos.canvas.CanvasActivity"
-                android:label="@string/app_name"
-                android:exported="true"
-                android:theme="@style/Theme.ProxyLauncher">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="com.google.android.canvas.category.BROWSE_LAUNCHER" />
-            </intent-filter>
-            <meta-data
-                android:name="com.google.android.canvas.data.launcher_info"
-                android:resource="@xml/canvas_info" />
-        </activity>
     </application>
 </manifest>