diff options
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0eb0c30e2..b3c5f5c0b 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" |