summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-10-04 21:49:15 +0000
committerMangesh Ghiware <mghiware@google.com>2013-10-04 15:10:19 -0700
commit47f602c3262652f981a9c98358e5a8bde41656ea (patch)
treeedac8adfec20b7d6248a8a6bb30cdbc6518892a2 /AndroidManifest.xml
parent8bf525cb49728310f1ca2bcda8c0a8355bde9785 (diff)
downloadandroid_packages_apps_Gallery2-47f602c3262652f981a9c98358e5a8bde41656ea.zip
android_packages_apps_Gallery2-47f602c3262652f981a9c98358e5a8bde41656ea.tar.gz
android_packages_apps_Gallery2-47f602c3262652f981a9c98358e5a8bde41656ea.tar.bz2
Revert "Disable GET_CONTENT intent-filter for KLP+"
This reverts commit a545774386d84dca5825b503c682a8eab272705c. Bug: 11085255 Change-Id: I254e9cbaca074928d77851083418e4d0f692b13b
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml28
1 files changed, 12 insertions, 16 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 21921dc..7b372a8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,6 +93,18 @@
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.APP_GALLERY" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.GET_CONTENT" />
+ <category android:name="android.intent.category.OPENABLE" />
+ <data android:mimeType="vnd.android.cursor.dir/image" />
+ </intent-filter>
+ <intent-filter>
+ <action android:name="android.intent.action.GET_CONTENT" />
+ <category android:name="android.intent.category.OPENABLE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <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>
@@ -160,22 +172,6 @@
</intent-filter>
</activity>
- <!-- This activity alias is added so that GET_CONTENT intent-filter
- can be disabled for KLP+ builds. -->
- <activity-alias android:name="com.android.gallery3d.app.GalleryPicker"
- android:targetActivity="com.android.gallery3d.app.Gallery"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="@string/app_name"
- android:enabled="@bool/atMostJellyBeanMR2">
- <intent-filter>
- <action android:name="android.intent.action.GET_CONTENT" />
- <category android:name="android.intent.category.OPENABLE" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="image/*" />
- <data android:mimeType="video/*" />
- </intent-filter>
- </activity-alias>
-
<!-- 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"