summaryrefslogtreecommitdiffstats
path: root/res/xml
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 14:04:11 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-08 14:04:11 -0700
commit7526636406087666d005d389ddc0cdacd79499fd (patch)
tree5c22a30b92c3cb7009444f669646cd1007148af9 /res/xml
parent7e107a0903707876c0ad7dd4ee2702fd5baed7ae (diff)
parent5d72b2726797374e402943182d8132045ed32d3a (diff)
downloadpackages_apps_settings-7526636406087666d005d389ddc0cdacd79499fd.zip
packages_apps_settings-7526636406087666d005d389ddc0cdacd79499fd.tar.gz
packages_apps_settings-7526636406087666d005d389ddc0cdacd79499fd.tar.bz2
am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '5d72b2726797374e402943182d8132045ed32d3a': Add support for SE Android to the Settings app.
Diffstat (limited to 'res/xml')
-rw-r--r--res/xml/device_info_settings.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index b156c11..324deaa 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -125,4 +125,10 @@
android:title="@string/build_number"
android:summary="@string/device_info_default"/>
+ <!-- SELinux status information -->
+ <Preference android:key="selinux_status"
+ style="?android:preferenceInformationStyle"
+ android:title="@string/selinux_status"
+ android:summary="@string/selinux_status_enforcing"/>
+
</PreferenceScreen>