commit 64c77e0086a00ddbf84d5711b33072aa63873ecc
author Panos Thomas <panos@codeaurora.org> Wed Dec 17 22:15:23 2014 -0800
committer WebTech Code Review <code-review@localhost> Wed Mar 25 16:08:09 2015 -0700
tree e6220736bbc880844270b7be8121a2103e8c9189
parent 5229d6a27be9ac8a704a49ba65d0500104cd4ccb

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

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index efae93d..d04560a 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>

res/values-zh-rHK/strings.xml

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index b39fd06..57d9092 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -417,4 +417,5 @@
     <string name="user_agent">"瀏覽器UA標識"</string>
     <string name="help">"幫助"</string>
     <string name="feedback">"反饋"</string>
+    <string name="mdm_managed_alert">被管理員禁用</string>
 </resources>

res/values-zh-rTW/strings.xml

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index f77a80d..2fa98a5 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -406,4 +406,5 @@
     <string name="user_agent">"瀏覽器UA標識"</string>
     <string name="help">"幫助"</string>
     <string name="feedback">"反饋"</string>
+    <string name="mdm_managed_alert">被管理員禁用</string>
 </resources>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7d700d..cc63a70 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1109,4 +1109,7 @@
     <string name="user_agent">User Agent</string>
     <string name="help">Help</string>
     <string name="feedback">Feedback</string>
+
+    <!-- Toast message displayed when user attempts to modify a setting disabled by the administrator -->
+    <string name="mdm_managed_alert">Managed by your administrator</string>
 </resources>