Revert "Disable GET_CONTENT intent-filter for KLP+"
This reverts commit a545774386d84dca5825b503c682a8eab272705c.
Bug: 11085255
Change-Id: I254e9cbaca074928d77851083418e4d0f692b13b
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"
diff --git a/res/values-v19/bool.xml b/res/values-v19/bool.xml
deleted file mode 100644
index 143b894..0000000
--- a/res/values-v19/bool.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<resources>
- <bool name="atMostJellyBeanMR2">false</bool>
-</resources>
diff --git a/res/values/bool.xml b/res/values/bool.xml
index 4e54d7c..464842a 100644
--- a/res/values/bool.xml
+++ b/res/values/bool.xml
@@ -15,5 +15,4 @@
-->
<resources>
<bool name="show_action_bar_title">false</bool>
- <bool name="atMostJellyBeanMR2">true</bool>
-</resources>
+</resources>
\ No newline at end of file