summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2013-03-08 11:19:27 -0800
committerJohn Reck <jreck@google.com>2013-03-08 11:22:33 -0800
commit211b65d8bd99ce6a6975043465f6c4432c72ed24 (patch)
tree26d71f82116d45754ae4a581b81f7b970f30ced8 /AndroidManifest.xml
parentf488cd4d0ba30efc0b57fff2aa2e445399946f4c (diff)
downloadandroid_packages_apps_Snap-211b65d8bd99ce6a6975043465f6c4432c72ed24.tar.gz
android_packages_apps_Snap-211b65d8bd99ce6a6975043465f6c4432c72ed24.tar.bz2
android_packages_apps_Snap-211b65d8bd99ce6a6975043465f6c4432c72ed24.zip
Support clicking on photos to view them
Change-Id: I511af0cbe46c833d81cbbd563b9c2b4feec2bffe
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml36
1 files changed, 21 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index abe76d2d5..3da58f76c 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"