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

Commit 83589187 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Add settings page to control cross profile appop"

parents da645144 14a887fb

AndroidManifest.xml

+22 −0
Original line number Diff line number Diff line
@@ -2471,6 +2471,28 @@ 
                android:value="com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails" />

        </activity>



        <activity

            android:name="Settings$InteractAcrossProfilesSettingsActivity"

            android:label="@string/interact_across_profiles_title">

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

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

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

            </intent-filter>

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

                       android:value="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesSettings" />

        </activity>



        <activity android:name="Settings$AppInteractAcrossProfilesSettingsActivity"

                  android:label="@string/interact_across_profiles_title">

            <intent-filter>

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

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

                <data android:scheme="package" />

            </intent-filter>

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

                       android:value="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetails" />

        </activity>



        <activity

            android:name="Settings$ZenAccessDetailSettingsActivity"

            android:label="@string/manage_zen_access_title"

res/values/strings.xml

+30 −0
Original line number Diff line number Diff line
@@ -8381,6 +8381,36 @@ 
    <!-- Apps > App Details > Picture-in-picture > Description. [CHAR LIMIT=NONE] -->

    <string name="picture_in_picture_app_detail_summary">Allow this app to create a picture-in-picture window while the app is open or after you leave it (for example, to continue watching a video).  This window displays on top of other apps you\'re using.</string>









    <!-- Special access > Title for managing the settings where users opt-in to connect a work app









    to its personal equivalent, allowing cross-profile communication. [CHAR LIMIT=50] -->









    <string name="interact_across_profiles_title" translatable="false">Connected work and personal apps</string>

















    <!-- Special access > Connected work and personal apps > Text to display when the list is empty. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_empty_text" translatable="false">No connected apps</string>

















    <!-- Special access > Connected work and personal apps > Additional keywords to search for. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_keywords" translatable="false">cross profile connected app apps work and personal</string>

















    <!-- Apps > App Details > Advanced section string title. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_app_detail_title" translatable="false">Connected work and personal apps</string>

















    <!-- Apps > App Details > Connected work and personal apps > Switch title. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_app_detail_switch" translatable="false">Connect these apps</string>

















    <!-- Apps > App Details > Connected work and personal apps > Description. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_summary_1" translatable="false">Connected apps share permissions and can access each other\u2019s data.</string>

















    <!-- Apps > App Details > Connected work and personal apps > Description. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_summary_2" translatable="false">Only connect apps that you trust with your personal data.Your data may be exposed to your IT admin.</string>

















    <!-- TODO(b/148594054): Replace calendar with actual app name -->









    <!-- Apps > App Details > Connected work and personal apps > Consent dialog title. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_consent_dialog_title" translatable="false">Trust work Calendar with your personal data?</string>

















    <!-- TODO(b/148594054): Replace calendar with actual app name -->









    <!-- Apps > App Details > Connected work and personal apps > Consent dialog description. [CHAR LIMIT=NONE] -->









    <string name="interact_across_profiles_consent_dialog_summary" translatable="false">Calendar may expose your personal data to your IT admin</string>

















    <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->









    <string name="manage_zen_access_title">Do Not Disturb access</string>

































res/xml/app_info_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -150,6 +150,12 @@







            android:summary="@string/summary_placeholder"









            settings:controller="com.android.settings.applications.appinfo.ExternalSourceDetailPreferenceController" />



















        <Preference









            android:key="interact_across_profiles"









            android:title="@string/interact_across_profiles_title"









            android:summary="@string/summary_placeholder"









            settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesDetailsPreferenceController" />



















    </PreferenceCategory>



















    <!-- App installer info -->
































res/xml/interact_across_profiles.xml
0 → 100644



+23
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  ~ Copyright (C) 2020 The Android Open Source Project









  ~









  ~ Licensed under the Apache License, Version 2.0 (the "License");









  ~ you may not use this file except in compliance with the License.









  ~ You may obtain a copy of the License at









  ~









  ~      http://www.apache.org/licenses/LICENSE-2.0









  ~









  ~ Unless required by applicable law or agreed to in writing, software









  ~ distributed under the License is distributed on an "AS IS" BASIS,









  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









  ~ See the License for the specific language governing permissions and









  ~ limitations under the License.









  -->



















<PreferenceScreen









    xmlns:android="http://schemas.android.com/apk/res/android"









    xmlns:settings="http://schemas.android.com/apk/res-auto"









    android:title="@string/interact_across_profiles_title"









    settings:controller="com.android.settings.applications.specialaccess.interactacrossprofiles.InteractAcrossProfilesController" />

































res/xml/interact_across_profiles_permissions_details.xml
0 → 100644



+38
−0






























Original line number
Diff line number
Diff line









<?xml version="1.0" encoding="utf-8"?>









<!--









  ~ Copyright (C) 2020 The Android Open Source Project









  ~









  ~ Licensed under the Apache License, Version 2.0 (the "License");









  ~ you may not use this file except in compliance with the License.









  ~ You may obtain a copy of the License at









  ~









  ~      http://www.apache.org/licenses/LICENSE-2.0









  ~









  ~ Unless required by applicable law or agreed to in writing, software









  ~ distributed under the License is distributed on an "AS IS" BASIS,









  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









  ~ See the License for the specific language governing permissions and









  ~ limitations under the License.









  -->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









    android:title="@string/interact_across_profiles_title">



















    <com.android.settingslib.widget.LayoutPreference









        android:key="interact_across_profiles_header"









        android:layout="@layout/cross_profiles_settings_entity_header"









        android:selectable="false"/>



















    <SwitchPreference









        android:key="interact_across_profiles_settings_switch"









        android:title="@string/interact_across_profiles_app_detail_switch"/>



















    <Preference









        android:summary="@string/interact_across_profiles_summary_1"









        android:selectable="false"/>



















    <Preference









        android:summary="@string/interact_across_profiles_summary_2"









        android:selectable="false"/>



















</PreferenceScreen>