diff options
| -rw-r--r-- | AndroidManifest.xml | 28 | ||||
| -rw-r--r-- | res/values-v19/bool.xml | 18 | ||||
| -rw-r--r-- | res/values/bool.xml | 3 |
3 files changed, 36 insertions, 13 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8f48edf20..d1642f38f 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" diff --git a/res/values-v19/bool.xml b/res/values-v19/bool.xml new file mode 100644 index 000000000..143b89487 --- /dev/null +++ b/res/values-v19/bool.xml @@ -0,0 +1,18 @@ +<?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 464842ab4..4e54d7c23 100644 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -15,4 +15,5 @@ --> <resources> <bool name="show_action_bar_title">false</bool> -</resources>
\ No newline at end of file + <bool name="atMostJellyBeanMR2">true</bool> +</resources> |