summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDelphin PETER <delphinpeter@gmail.com>2013-07-18 23:22:22 +0200
committerDelphin PETER <delphinpeter@gmail.com>2013-07-18 23:22:22 +0200
commite1e571bd4ba4ee9eea519c663e4d1eeb53c0e8fd (patch)
tree04114bdd139ce1f00fd21e7af04b314fe92c4fb5
parentba124a9e8368917100dbdf78665975b75c372a34 (diff)
downloadframeworks_base-e1e571bd4ba4ee9eea519c663e4d1eeb53c0e8fd.zip
frameworks_base-e1e571bd4ba4ee9eea519c663e4d1eeb53c0e8fd.tar.gz
frameworks_base-e1e571bd4ba4ee9eea519c663e4d1eeb53c0e8fd.tar.bz2
Frameworks : move custom strings to cm_strings.xml
Change-Id: Ie70f69474b9e83b6f9e2df4d34d6109008343356
-rw-r--r--core/res/res/values/cm_strings.xml9
-rw-r--r--core/res/res/values/strings.xml8
2 files changed, 9 insertions, 8 deletions
diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml
index 33f07f0..4e43675 100644
--- a/core/res/res/values/cm_strings.xml
+++ b/core/res/res/values/cm_strings.xml
@@ -181,4 +181,13 @@
intercept an outgoing SMS.
Malicious apps may use this to prevent outgoing SMS messages.</string>
+ <!-- Title of policy access to start enforcing SELinux policy [CHAR LIMIT=30]-->
+ <string name="policylab_enforceSelinux">Enforce SELinux</string>
+ <!-- Description of policy access to start enforcing SELinux policy [CHAR LIMIT=110]-->
+ <string name="policydesc_enforceSelinux">Toggle SELinux policy enforcing or permissive mode.</string>
+ <!-- Title of policy access to start enforcing MMAC policy [CHAR LIMIT=30]-->
+ <string name="policylab_enforceMmac">Enforce MMAC</string>
+ <!-- Description of policy access to start enforcing MMAC policy [CHAR LIMIT=110]-->
+ <string name="policydesc_enforceMmac">Toggle MMAC policy enforcing or permissive mode.</string>
+
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 34e6f48..e061032 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -1820,14 +1820,6 @@
<string name="policylab_disableKeyguardFeatures">Disable features in keyguard</string>
<!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
<string name="policydesc_disableKeyguardFeatures">Prevent use of some features in keyguard.</string>
- <!-- Title of policy access to start enforcing SELinux policy [CHAR LIMIT=30]-->
- <string name="policylab_enforceSelinux">Enforce SELinux</string>
- <!-- Description of policy access to start enforcing SELinux policy [CHAR LIMIT=110]-->
- <string name="policydesc_enforceSelinux">Toggle SELinux policy enforcing or permissive mode.</string>
- <!-- Title of policy access to start enforcing MMAC policy [CHAR LIMIT=30]-->
- <string name="policylab_enforceMmac">Enforce MMAC</string>
- <!-- Description of policy access to start enforcing MMAC policy [CHAR LIMIT=110]-->
- <string name="policydesc_enforceMmac">Toggle MMAC policy enforcing or permissive mode.</string>
<!-- The order of these is important, don't reorder without changing Contacts.java --> <skip />
<!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->