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

Commit 454ba5f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Override default app intents that were in Settings." into qt-dev

parents ad79ec6a a80cebc7

AndroidManifest.xml

+6 −5
Original line number Original line Diff line number Diff line
@@ -186,14 +186,15 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>





        <!-- TODO: STOPSHIP: Removed permissions because apps were able to launch it. Is this good? -->

        <activity android:name="com.android.packageinstaller.role.ui.DefaultAppListActivity"

        <activity android:name="com.android.packageinstaller.role.ui.DefaultAppListActivity"

                  android:label="@string/default_apps"

                  android:label="@string/default_apps"

                  android:theme="@style/Settings">

                  android:theme="@style/Settings">

            <!-- TODO: STOPSHIP: give this a priority greater than 1 to override Settings. -->

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

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

                <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />

                <action android:name="android.settings.MANAGE_DEFAULT_APPS_SETTINGS" />

                <!-- TODO: Redirect into role page? -->

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

            </intent-filter>

            <!-- TODO: STOPSHIP: Redirect into its own default app page? -->

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

                <action android:name="android.settings.HOME_SETTINGS" />

                <action android:name="android.settings.HOME_SETTINGS" />

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

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

            </intent-filter>

            </intent-filter>
@@ -218,7 +219,7 @@ 
            </intent-filter>

            </intent-filter>

        </activity>

        </activity>





        <!-- TODO: STOPSHIP: Override other Settings intents. -->

        <!-- TODO: Override other Settings intents when we've done migrating them. -->

        <activity android:name="com.android.packageinstaller.role.ui.SpecialAppAccessActivity"

        <activity android:name="com.android.packageinstaller.role.ui.SpecialAppAccessActivity"

                  android:theme="@style/Settings" />

                  android:theme="@style/Settings" />