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

Commit 0a79769c authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Settings page to manage FSI permission"

parents 488f69a0 685f1e47

AndroidManifest.xml

+19 −0
Original line number Diff line number Diff line
@@ -1681,6 +1681,25 @@ 
                       android:value="@string/menu_key_apps"/>

        </activity-alias>



        <activity-alias android:name="com.google.android.settings.ManageFullScreenIntent"

                        android:exported="true"

                        android:targetActivity=".spa.SpaBridgeActivity">

            <meta-data android:name="com.android.settings.spa.DESTINATION"

                       android:value="TogglePermissionAppList/UseFullScreenIntent"/>

        </activity-alias>



        <activity-alias android:name="com.google.android.settings.AppManageFullScreenIntent"

                        android:exported="true"

                        android:targetActivity=".spa.SpaAppBridgeActivity">

            <intent-filter>

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

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

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.spa.DESTINATION"

                       android:value="TogglePermissionAppInfoPage/UseFullScreenIntent"/>

        </activity-alias>



        <activity android:name=".applications.InstalledAppOpenByDefaultActivity"

                  android:label="@string/application_info_label"

                  android:exported="true">

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -8944,6 +8944,15 @@ 
    <!-- Label for showing apps that can manage external storage[CHAR LIMIT=45] -->

    <string name="filter_manage_external_storage">Can access all files</string>













    <!-- Manage full screen intent permission title [CHAR LIMIT=40] -->













    <string name="full_screen_intent_title">Manage full screen intents</string>

























    <!-- Label for setting that allows apps to send full screen intents. [CHAR LIMIT=NONE] -->













    <string name="permit_full_screen_intent">Allow apps to send full screen intents</string>

























    <!-- 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 send full screen intent notifications that cover the entire screen.</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








@@ -94,6 +94,11 @@













        android:fragment="com.android.settings.notification.NotificationAccessSettings"















        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessController" />





























    <Preference













        android:key="use_full_screen_intent"













        android:title="@string/full_screen_intent_title"













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





























    <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








@@ -31,6 +31,7 @@ import com.android.settings.spa.app.specialaccess.ModifySystemSettingsAppListPro













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















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















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













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















import com.android.settings.spa.development.UsageStatsPageProvider















import com.android.settings.spa.home.HomePageProvider















import com.android.settings.spa.notification.AppListNotificationsPageProvider









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













            DisplayOverOtherAppsAppListProvider,















            MediaManagementAppsAppListProvider,















            ModifySystemSettingsAppListProvider,













            UseFullScreenIntentAppListProvider,















            PictureInPictureListProvider,















            InstallUnknownAppsListProvider,















            AlarmsAndRemindersAppListProvider,

































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



+1
−0




























Original line number
Diff line number
Diff line








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













                DisplayOverOtherAppsAppListProvider,















                MediaManagementAppsAppListProvider,















                ModifySystemSettingsAppListProvider,













                UseFullScreenIntentAppListProvider,















                PictureInPictureListProvider,















                InstallUnknownAppsListProvider,















                AlarmsAndRemindersAppListProvider,