diff options
| author | Panos Thomas <panos@codeaurora.org> | 2014-12-17 22:15:23 -0800 |
|---|---|---|
| committer | WebTech Code Review <code-review@localhost> | 2015-03-25 16:08:09 -0700 |
| commit | 64c77e0086a00ddbf84d5711b33072aa63873ecc (patch) | |
| tree | e6220736bbc880844270b7be8121a2103e8c9189 /res/values-zh-rCN | |
| parent | 5229d6a27be9ac8a704a49ba65d0500104cd4ccb (diff) | |
| download | android_packages_apps_Gello-64c77e0086a00ddbf84d5711b33072aa63873ecc.tar.gz android_packages_apps_Gello-64c77e0086a00ddbf84d5711b33072aa63873ecc.tar.bz2 android_packages_apps_Gello-64c77e0086a00ddbf84d5711b33072aa63873ecc.zip | |
Add support for managed profile configuration
- Add framework for reading and enforcing managed profile restrictions.
- Implement enforcement of search engine restriction.
- Add automated test for search engine restriction.
(cherry-picked from 4688934c52fa74e0c4280e4105e644f10221a8ed)
Change-Id: Ifb6018df584fedba42e86ab35d9bfa53b4d36ebe
Diffstat (limited to 'res/values-zh-rCN')
| -rw-r--r-- | res/values-zh-rCN/strings.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index efae93d0..d04560a8 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -498,4 +498,7 @@ <string name="user_agent">"浏览器UA标识"</string> <string name="help">"帮助"</string> <string name="feedback">"反馈"</string> + + <!-- Toast message displayed when user attempts to modify a setting disabled by the administrator --> + <string name="mdm_managed_alert">被管理员禁用</string> </resources> |