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

Commit 6ca5c992 authored by Jason Chiu's avatar Jason Chiu Committed by Android (Google) Code Review
Browse files

Merge "[Safer intents] Permission controller" into main

parents cac043d8 cf13dfd4

res/xml/apps.xml

+2 −6
Original line number Diff line number Diff line
@@ -58,9 +58,7 @@ 
        android:key="default_apps"

        android:title="@string/app_default_dashboard_title"

        android:order="-996"

        settings:controller="com.android.settings.applications.DefaultAppsPreferenceController">

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

    </Preference>

        settings:controller="com.android.settings.applications.DefaultAppsPreferenceController"/>



    <Preference

        android:key="cloned_apps"
@@ -87,9 +85,7 @@ 
        android:summary="@string/summary_placeholder"

        android:order="15"

        settings:keywords="app_hibernation_key"

        settings:controller="com.android.settings.applications.HibernatedAppsPreferenceController">

        <intent android:action="android.intent.action.MANAGE_UNUSED_APPS"/>

    </Preference>

        settings:controller="com.android.settings.applications.HibernatedAppsPreferenceController"/>



    <Preference

        android:key="app_battery_usage"

res/xml/location_settings.xml

+1 −6
Original line number Diff line number Diff line
@@ -61,12 +61,7 @@ 
        <Preference

            android:key="app_level_permissions"

            android:title="@string/location_app_level_permissions"

            settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController">

            <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">

                <extra android:name="android.intent.extra.PERMISSION_NAME"

                       android:value="android.permission-group.LOCATION"/>

            </intent>

        </Preference>

            settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController"/>



        <Preference

            android:fragment="com.android.settings.location.LocationServices"

res/xml/location_settings_personal.xml

+2 −7
Original line number Diff line number Diff line
@@ -38,14 +38,9 @@ 


    <!-- This preference category gets removed if new_recent_location_ui is disabled -->

    <Preference

        android:key="app_level_permissions"

        android:key="app_level_permissions_personal"

        android:title="@string/location_app_level_permissions"

        settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController">

        <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">

            <extra android:name="android.intent.extra.PERMISSION_GROUP_NAME"

                   android:value="android.permission-group.LOCATION"/>

        </intent>

    </Preference>

        settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController"/>



    <Preference

        android:key="location_services"

res/xml/location_settings_workprofile.xml

+2 −7
Original line number Diff line number Diff line
@@ -46,14 +46,9 @@ 


    <!-- This preference category gets removed if new_recent_location_ui is disabled -->

    <Preference

        android:key="app_level_permissions"

        android:key="app_level_permissions_work"

        android:title="@string/location_app_level_permissions"

        settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController">

        <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">

            <extra android:name="android.intent.extra.PERMISSION_GROUP_NAME"

                   android:value="android.permission-group.LOCATION"/>

        </intent>

    </Preference>

        settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController"/>



    <Preference

        android:key="location_services_for_work"

res/xml/more_security_privacy_settings.xml

+1 −3
Original line number Diff line number Diff line
@@ -74,9 +74,7 @@ 
        <Preference

            android:key="privacy_accessibility_usage"

            android:title="@string/accessibility_usage_title"

            settings:controller="com.android.settings.privacy.AccessibilityUsagePreferenceController">

            <intent android:action="android.intent.action.REVIEW_ACCESSIBILITY_SERVICES"/>

        </Preference>

            settings:controller="com.android.settings.privacy.AccessibilityUsagePreferenceController"/>



        <!-- On lock screen notifications -->

        <com.android.settings.RestrictedListPreference