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

Merge "Policy transparency for mandatory backups."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-23 05:21:41 +00:00
committed by Android (Google) Code Review
parent 70d01a51c3 a5f12c6b5c
commit 442a53c5fb
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -8340,6 +8340,8 @@
<string name="disabled_by_policy_title_camera">Camera not allowed</string> <string name="disabled_by_policy_title_camera">Camera not allowed</string>
<!-- Title for dialog displayed to tell user that screenshots are disabled by an admin [CHAR LIMIT=50] --> <!-- Title for dialog displayed to tell user that screenshots are disabled by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string> <string name="disabled_by_policy_title_screen_capture">Screenshot not allowed</string>
<!-- Title for dialog displayed to tell user that turning off backups is disallowed by an admin [CHAR LIMIT=50] -->
<string name="disabled_by_policy_title_turn_off_backups">Can\'t turn off backups</string>
<!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] --> <!-- Shown when the user tries to change a settings locked by an admin [CHAR LIMIT=200] -->
<string name="default_admin_support_msg">This action is disabled. To learn more, contact your <string name="default_admin_support_msg">This action is disabled. To learn more, contact your
organization\'s admin.</string> organization\'s admin.</string>

3
src/com/android/settings/ShowAdminSupportDetailsDialog.java
View File

@@ -150,6 +150,9 @@ public class ShowAdminSupportDetailsDialog extends Activity
case DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE: case DevicePolicyManager.POLICY_DISABLE_SCREEN_CAPTURE:
titleView.setText(R.string.disabled_by_policy_title_screen_capture); titleView.setText(R.string.disabled_by_policy_title_screen_capture);
break; break;
case DevicePolicyManager.POLICY_MANDATORY_BACKUPS:
titleView.setText(R.string.disabled_by_policy_title_turn_off_backups);
break;
default: default:
// Use general text if no specialized title applies // Use general text if no specialized title applies
titleView.setText(R.string.disabled_by_policy_title); titleView.setText(R.string.disabled_by_policy_title);