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

Merge "String changes in the cross profile settings page" into rvc-dev am: 311ff0c1ea

Browse Source 
Change-Id: I578ee55ae704365805c9b370973076e8b78abf6d
This commit is contained in:
Kholoud Mohamed
2020-05-12 20:45:49 +00:00
committed by Automerger Merge Worker
parent f6d924b9dd 311ff0c1ea
commit c60cf0bc3e
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -8666,7 +8666,7 @@
<!-- Settings text. This text lets a user know that they should only connect work and personal apps <!-- Settings text. This text lets a user know that they should only connect work and personal apps
if they trust the work app with their personal data. The work app could potentially show that data if they trust the work app with their personal data. The work app could potentially show that data
to the user's IT admin. [CHAR LIMIT=NONE] --> to the user's IT admin. [CHAR LIMIT=NONE] -->
<string name="interact_across_profiles_summary_2">Only connect apps that you trust with your personal data. Work apps may expose your data to your IT admin.</string> <string name="interact_across_profiles_summary_2">Only connect apps if you trust them not to share personal data with your IT admin.</string>
<!-- Dialog title. This dialog is shown when a user tries to connect a work app to a personal <!-- Dialog title. This dialog is shown when a user tries to connect a work app to a personal
app (e.g. their work Calendar to their personal Calendar), and it's confirming that they should app (e.g. their work Calendar to their personal Calendar), and it's confirming that they should
@@ -8677,7 +8677,7 @@
app (e.g. their work Calendar to their personal Calendar), and it's confirming that they should app (e.g. their work Calendar to their personal Calendar), and it's confirming that they should
connect the apps only if they trust the work app with their personal data. connect the apps only if they trust the work app with their personal data.
The placeholder is the app name. [CHAR LIMIT=NONE] --> The placeholder is the app name. [CHAR LIMIT=NONE] -->
<string name="interact_across_profiles_consent_dialog_summary"><xliff:g id="name" example="Calendar">%1$s</xliff:g> may expose your personal data to your IT admin.</string> <string name="interact_across_profiles_consent_dialog_summary">Only connect apps if you trust them not to share personal data with your IT admin.</string>
<!-- Title of a section in a dialog. This section shows the app data that will be <!-- Title of a section in a dialog. This section shows the app data that will be
accessible when work and personal apps are connected. [CHAR LIMIT=NONE] --> accessible when work and personal apps are connected. [CHAR LIMIT=NONE] -->
@@ -8708,12 +8708,12 @@
<!-- Banner title. This banner lets a user know that they need to install an app in their <!-- 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. 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]--> The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]-->
<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> <string name="interact_across_profiles_install_work_app_title">To connect these apps, install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your work profile</string>
<!-- Banner title. This banner lets a user know that they need to install an app in their <!-- 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. personal profile in order to connect it to the corresponding work app.
The placeholder would be the app name (e.g. Calendar). [CHAR LIMIT=NONE]--> 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> <string name="interact_across_profiles_install_personal_app_title">To connect these apps, install <xliff:g id="name" example="Calendar">%1$s</xliff:g> in your personal profile</string>
<!-- Banner text. This banner lets a user know that they need to install an app in their <!-- Banner text. This banner lets a user know that they need to install an app in their
work/personal profile in order to connect it to the corresponding personal app. work/personal profile in order to connect it to the corresponding personal app.

5
src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
View File

@@ -255,11 +255,6 @@ public class InteractAcrossProfilesDetails extends AppInfoBase
dialogTitle.setText( dialogTitle.setText(
getString(R.string.interact_across_profiles_consent_dialog_title, mAppLabel)); getString(R.string.interact_across_profiles_consent_dialog_title, mAppLabel));
final TextView dialogSummary = dialogView.findViewById(
R.id.interact_across_profiles_consent_dialog_summary);
dialogSummary.setText(
getString(R.string.interact_across_profiles_consent_dialog_summary, mAppLabel));
final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary); final TextView appDataSummary = dialogView.findViewById(R.id.app_data_summary);
appDataSummary.setText(getString( appDataSummary.setText(getString(
R.string.interact_across_profiles_consent_dialog_app_data_summary, mAppLabel)); R.string.interact_across_profiles_consent_dialog_app_data_summary, mAppLabel));