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

Commit 0d585fc4 authored by Chris Antol's avatar Chris Antol Committed by Android (Google) Code Review
Browse files

Merge "Add Special App Access page for WRITE_SYSTEM_PREFERENCES permission" into main

parents a3cdf474 22306eb9

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -10429,6 +10429,10 @@ 
    <!-- Description for setting that allows apps to send full screen intents. [CHAR LIMIT=NONE] -->

    <string name="footer_description_full_screen_intent">Allow this app to show notifications that take up the full screen when the device is locked. Apps may use these to highlight alarms, incoming calls, or other urgent notifications.</string>









    <string name="write_system_preferences_page_title">Write system preferences</string>









    <string name="write_system_preferences_switch_title">Allow this app to modify system preferences on your behalf</string>









    <string name="write_system_preferences_footer_description">This permission allows an app to modify core system preferences.</string>

















    <!-- Media management apps settings title [CHAR LIMIT=40] -->









    <string name="media_management_apps_title">Media management apps</string>









    <!-- Label for a setting which controls whether an app can manage media files [CHAR LIMIT=45] -->

























res/xml/special_access.xml



+5
−0






























Original line number
Diff line number
Diff line







@@ -106,6 +106,11 @@







        android:title="@string/full_screen_intent_title"









        settings:controller="com.android.settings.spa.app.specialaccess.UseFullScreenIntentPreferenceController" />



















    <Preference









        android:key="write_system_preferences"









        android:title="@string/write_system_preferences_page_title"









        settings:controller="com.android.settings.spa.app.specialaccess.WriteSystemPreferencesPreferenceController" />



















    <Preference









        android:key="picture_in_picture"









        android:title="@string/picture_in_picture_title"
































src/com/android/settings/spa/SettingsSpaEnvironment.kt



+2
−0






























Original line number
Diff line number
Diff line







@@ -42,6 +42,7 @@ import com.android.settings.spa.app.specialaccess.SpecialAppAccessPageProvider







import com.android.settings.spa.app.specialaccess.TurnScreenOnAppsAppListProvider









import com.android.settings.spa.app.specialaccess.UseFullScreenIntentAppListProvider









import com.android.settings.spa.app.specialaccess.WifiControlAppListProvider









import com.android.settings.spa.app.specialaccess.WriteSystemPreferencesAppListProvider









import com.android.settings.spa.app.storage.StorageAppListPageProvider









import com.android.settings.spa.core.instrumentation.SpaLogMetricsProvider









import com.android.settings.spa.core.instrumentation.SpaLogProvider








@@ -80,6 +81,7 @@ open class SettingsSpaEnvironment(context: Context) : SpaEnvironment(context) {







            NfcTagAppsSettingsProvider,









            LongBackgroundTasksAppListProvider,









            TurnScreenOnAppsAppListProvider,









            WriteSystemPreferencesAppListProvider,









        )









    }










































src/com/android/settings/spa/app/appinfo/AppInfoSettings.kt



+2
−0






























Original line number
Diff line number
Diff line







@@ -42,6 +42,7 @@ import com.android.settings.spa.app.specialaccess.DisplayOverOtherAppsAppListPro







import com.android.settings.spa.app.specialaccess.InstallUnknownAppsListProvider









import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListProvider









import com.android.settings.spa.app.specialaccess.PictureInPictureListProvider









import com.android.settings.spa.app.specialaccess.WriteSystemPreferencesAppListProvider









import com.android.settingslib.spa.framework.common.SettingsPageProvider









import com.android.settingslib.spa.framework.compose.navigator









import com.android.settingslib.spa.widget.scaffold.RegularScaffold








@@ -167,6 +168,7 @@ private fun AppInfoSettings(packageInfoPresenter: PackageInfoPresenter) {







            InstallUnknownAppsListProvider.InfoPageEntryItem(app)









            InteractAcrossProfilesDetailsPreference(app)









            AlarmsAndRemindersAppListProvider.InfoPageEntryItem(app)









            WriteSystemPreferencesAppListProvider.InfoPageEntryItem(app)









        }



















        Category(title = stringResource(R.string.app_install_details_group_title)) {
































src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt



+1
−0






























Original line number
Diff line number
Diff line







@@ -70,6 +70,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {







                WifiControlAppListProvider,









                LongBackgroundTasksAppListProvider,









                TurnScreenOnAppsAppListProvider,









                WriteSystemPreferencesAppListProvider,









            )









            .map { it.buildAppListInjectEntry().setLink(fromPage = owner).build() }









    }