summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorMangesh Ghiware <mghiware@google.com>2013-08-21 14:00:34 -0700
committerMangesh Ghiware <mghiware@google.com>2013-10-03 16:08:08 -0700
commita545774386d84dca5825b503c682a8eab272705c (patch)
tree6ed223340b0246539212b84c8fcef8088fea20b8 /AndroidManifest.xml
parent06c027675948259368a902fd6f8c2ecac5db5167 (diff)
downloadandroid_packages_apps_Gallery2-a545774386d84dca5825b503c682a8eab272705c.zip
android_packages_apps_Gallery2-a545774386d84dca5825b503c682a8eab272705c.tar.gz
android_packages_apps_Gallery2-a545774386d84dca5825b503c682a8eab272705c.tar.bz2
Disable GET_CONTENT intent-filter for KLP+
Bug: 10415790 Change-Id: I94260dbe7c61c1ead2a0e6ea12f837a76a69d547
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml28
1 files changed, 16 insertions, 12 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8f48edf..d1642f3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -93,18 +93,6 @@
<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>
@@ -172,6 +160,22 @@
</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"