commit f6e687bc30887695374580712092aeb917c84253
author John Reck <jreck@google.com> Fri Mar 08 11:19:27 2013 -0800
committer John Reck <jreck@google.com> Fri Mar 08 11:22:33 2013 -0800
tree f067cf3bead03c5d70fb387e6483bd51138551eb
parent d3d2e2763bb4187a2dd3ac350d3a3c51d092890a

Support clicking on photos to view them

Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index abe76d2..3da58f7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -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,6 @@
                 <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"