Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac58e080 authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android Git Automerger
Browse files

am a5457743: Disable GET_CONTENT intent-filter for KLP+ 

* commit 'a5457743':
  Disable GET_CONTENT intent-filter for KLP+
parents 85346e02 a5457743

AndroidManifest.xml

+16 −12
Original line number Diff line number Diff line
@@ -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"

res/values-v19/bool.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?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>

res/values/bool.xml

+2 −1
Original line number Diff line number Diff line
@@ -15,4 +15,5 @@ 
-->

<resources>

    <bool name="show_action_bar_title">false</bool>

    <bool name="atMostJellyBeanMR2">true</bool>

</resources>