diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-08 14:06:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-08 14:06:31 -0700 |
| commit | 66321184570da9e93c089b2a1065fc3d4c7230a3 (patch) | |
| tree | 5cf9124445cd6538b7ab187dce7c8e5eaaaf2038 /res/values | |
| parent | a1f463cb1930e806420844d4915def2dcfe7ae72 (diff) | |
| parent | 7526636406087666d005d389ddc0cdacd79499fd (diff) | |
| download | packages_apps_Settings-66321184570da9e93c089b2a1065fc3d4c7230a3.zip packages_apps_Settings-66321184570da9e93c089b2a1065fc3d4c7230a3.tar.gz packages_apps_Settings-66321184570da9e93c089b2a1065fc3d4c7230a3.tar.bz2 | |
am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '7526636406087666d005d389ddc0cdacd79499fd':
Add support for SE Android to the Settings app.
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/strings.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index b89fe3a..3c54d1a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1789,6 +1789,8 @@ <string name="kernel_version">Kernel version</string> <!-- About phone screen, setting option name--> <string name="build_number">Build number</string> + <!-- About phone screen, setting option name--> + <string name="selinux_status">SELinux status</string> <!-- About phone screen, show when a value of some status item is unavailable. --> <string name="device_info_not_available">Not available</string> @@ -4062,6 +4064,11 @@ from their cell phone carrier. The use of the string is similar to the string "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] --> <string name="additional_system_update_settings_list_item_title">Additional system updates</string> + <!-- These statuses are displayed when a device was built with SE Android supoprt. + These are displayed by the settings app in the about section. --> + <string name="selinux_status_disabled">Disabled</string> + <string name="selinux_status_permissive">Permissive</string> + <string name="selinux_status_enforcing">Enforcing</string> <!-- User settings --> <skip/> |