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

Commit 4b7a40d0 authored by Ben Reich's avatar Ben Reich
Browse files

Always include intent-filters for PickActivity 

The PickActivity is currently listed as priority 100 for all the
intent-filters. These will always be smaller than TrampolineActivity
when enabled as well as Photopicker so we don't really have to remove
them. It adds the safeguard that when the flag is off it falls back.

Given for this flag we'll just be launching it to handle the intents
related to Photopicker. Let's just include the GET_CONTENT in the
TrampolineActivity and we can include others when the need arises.

Bug: 377771195
Test: atest com.android.documentsui.TrampolineActivity
Flag: com.android.documentsui.flags.redirect_get_content_ro
Change-Id: I4abe21989dcc20b20e98b0d28c8aac312090c73d
parent d78ec662

AndroidManifest.xml

+4 −28
Original line number Original line Diff line number Diff line
@@ -65,28 +65,12 @@ 
            android:theme="@android:style/Theme.NoDisplay"

            android:theme="@android:style/Theme.NoDisplay"

            android:featureFlag="com.android.documentsui.flags.redirect_get_content_ro"

            android:featureFlag="com.android.documentsui.flags.redirect_get_content_ro"

            android:visibleToInstantApps="true">

            android:visibleToInstantApps="true">

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.CREATE_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

            </intent-filter>

            <intent-filter android:priority="120">

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.GET_CONTENT" />

                <action android:name="android.intent.action.GET_CONTENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

                <data android:mimeType="*/*" />

            </intent-filter>

            </intent-filter>

            <intent-filter android:priority="120">

                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

        </activity>

        </activity>





        <activity

        <activity
@@ -94,33 +78,25 @@ 
            android:exported="true"

            android:exported="true"

            android:theme="@style/LauncherTheme"

            android:theme="@style/LauncherTheme"

            android:visibleToInstantApps="true">

            android:visibleToInstantApps="true">

            <intent-filter

            <intent-filter android:priority="100">

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <action android:name="android.intent.action.OPEN_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

                <data android:mimeType="*/*" />

            </intent-filter>

            </intent-filter>

            <intent-filter

            <intent-filter android:priority="100">

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

                <action android:name="android.intent.action.CREATE_DOCUMENT" />

                <action android:name="android.intent.action.CREATE_DOCUMENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

                <data android:mimeType="*/*" />

            </intent-filter>

            </intent-filter>

            <intent-filter

            <intent-filter android:priority="100">

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

                <action android:name="android.intent.action.GET_CONTENT" />

                <action android:name="android.intent.action.GET_CONTENT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.OPENABLE" />

                <category android:name="android.intent.category.OPENABLE" />

                <data android:mimeType="*/*" />

                <data android:mimeType="*/*" />

            </intent-filter>

            </intent-filter>

            <intent-filter

            <intent-filter android:priority="100">

                android:featureFlag="!com.android.documentsui.flags.redirect_get_content_ro"

                android:priority="100">

                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />

                <action android:name="android.intent.action.OPEN_DOCUMENT_TREE" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            </intent-filter>