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

Merge "Simplify user flow for setting default supervisor as PO" into qt-dev

Browse Source
This commit is contained in:
Michael Wachenschwanz
2019-05-02 14:35:20 +00:00
committed by Android (Google) Code Review
parent 91acd50ef2 35eef604a3
commit 563b56af75
5 changed files with 141 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -6023,6 +6023,9 @@
<string name="device_admin_warning">Activating this admin app will allow
the app <xliff:g id="app_name">%1$s</xliff:g> to perform the
following operations:</string>
<!-- Simplified device admin warning message [CHAR LIMIT=NONE]-->
<string name="device_admin_warning_simplified">This device will be managed and monitored by
<xliff:g id="app_name" example="Example Supervisor">%1$s</xliff:g>.</string>
<!-- Device admin warning message about policies an admin can use -->
<string name="device_admin_status">This admin app is active and allows
the app <xliff:g id="app_name">%1$s</xliff:g> to perform the
@@ -6030,6 +6033,8 @@
<!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
<string name="profile_owner_add_title">Activate Profile Manager?</string>
<!-- Simplified title for dialog to set a profile owner [CHAR LIMIT=40] -->
<string name="profile_owner_add_title_simplified">Allow supervision?</string>
<!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
<string name="adding_profile_owner_warning">By proceeding, your user will be managed by your
admin which may also be able to store associated data, in addition to your personal