diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-07-21 05:13:04 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-07-21 05:13:04 -0700 |
| commit | b235f9f3eedeeeb1ce1aba90f462234accc1839b (patch) | |
| tree | 36159ec7fd0a08d77b7c8f74304970ea8dee4e96 | |
| parent | 4b5a9351023125ee664c585786a3511e4a91c311 (diff) | |
| parent | e1e571bd4ba4ee9eea519c663e4d1eeb53c0e8fd (diff) | |
| download | frameworks_base-b235f9f3eedeeeb1ce1aba90f462234accc1839b.zip frameworks_base-b235f9f3eedeeeb1ce1aba90f462234accc1839b.tar.gz frameworks_base-b235f9f3eedeeeb1ce1aba90f462234accc1839b.tar.bz2 | |
Merge "Frameworks : move custom strings to cm_strings.xml" into cm-10.1
| -rw-r--r-- | core/res/res/values/cm_strings.xml | 9 | ||||
| -rw-r--r-- | core/res/res/values/strings.xml | 8 |
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. --> |