PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a

Browse Source 
Change-Id: Icdfbcdc0c64a6784a0593f34cb9e141bbbc259e7
This commit is contained in:
Kholoud Mohamed
2020-03-31 13:27:00 +00:00
committed by Automerger Merge Worker
parent f62beedb4f 7fb6f35c3a
commit c2b8fd2e85
9 changed files with 428 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/drawable/ic_download_for_offline.xml Normal file
View File

@@ -0,0 +1,21 @@
<!--
~ 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.
-->
<vector android:autoMirrored="true" android:height="24dp"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#4285F4" android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM14.59,8.59L16,10l-4,4 -4,-4 1.41,-1.41L11,10.17L11,6h2v4.17l1.59,-1.58zM17,17L7,17v-2h10v2z"/>
</vector>

25
res/values/strings.xml
View File

@@ -8537,6 +8537,12 @@
When a user connects select work and personal apps, they can access work and personal data together. [CHAR LIMIT=50] -->
<string name="interact_across_profiles_title">Connected work &amp; personal apps</string>
<!-- Settings subtext. This text is shown when the work and personal apps are connected. [CHAR LIMIT=45] -->
<string name="interact_across_profiles_summary_allowed">Connected</string>
<!-- Settings subtext. This text is shown when the work and personal apps are not connected. [CHAR LIMIT=45] -->
<string name="interact_across_profiles_summary_not_allowed">Not connected</string>
<!-- Settings subtext. This text is shown when a user doesn't have any connected apps. [CHAR LIMIT=NONE] -->
<string name="interact_across_profiles_empty_text">No connected apps</string>
@@ -8603,27 +8609,18 @@
<!-- Banner title. This banner lets a user know that they need to install an app in their
work profile in order to connect it to the corresponding personal app.
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=50]-->
<string name="interact_across_profiles_install_work_app_title">Install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your work profile</string>
<!-- Banner text. This banner lets a user know that they need to install an app in their
work profile in order to connect it to the corresponding personal app.
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->
<string name="interact_across_profiles_install_work_app_summary">To connect these apps, install the <xliff:g id="name" example="Calendar">%1$s</xliff:g> app in your work profile</string>
<string name="interact_across_profiles_install_work_app_title">Install work <xliff:g id="name" example="Calendar">%1$s</xliff:g> to connect these apps</string>
<!-- Banner title. This banner lets a user know that they need to install an app in their
personal profile in order to connect it to the corresponding work app.
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=50]-->
<string name="interact_across_profiles_install_personal_app_title">Install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your personal profile</string>
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->
<string name="interact_across_profiles_install_personal_app_title">Install personal <xliff:g id="name" example="Calendar">%1$s</xliff:g> to connect these apps</string>
<!-- Banner text. This banner lets a user know that they need to install an app in their
personal profile in order to connect it to the corresponding work app.
work/personal profile in order to connect it to the corresponding personal app.
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->
<string name="interact_across_profiles_install_personal_app_summary">To connect these apps, install the <xliff:g id="name" example="Calendar">%1$s</xliff:g> app in your personal profile</string>
<!-- Button text. This button takes a user to the app store so they can download and
install the app they need. [CHAR LIMIT=50]-->
<string name="interact_across_profiles_install_app_action">Get the app</string>
<string name="interact_across_profiles_install_app_summary">Tap to get the app</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>

32
res/xml/interact_across_profiles_permissions_details.xml
View File

@@ -15,22 +15,28 @@
~ limitations under the License.
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<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"/>
<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" />
<com.android.settings.widget.CardPreference
android:key="install_app_banner"
android:icon="@drawable/ic_download_for_offline"
android:gravity="top"/>
<Preference
android:summary="@string/interact_across_profiles_summary_1"
android:selectable="false" />
<com.android.settingslib.RestrictedSwitchPreference
android:key="interact_across_profiles_settings_switch" />
<Preference
android:summary="@string/interact_across_profiles_summary_2"
android:selectable="false" />
<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>