summaryrefslogtreecommitdiffstats
path: root/res/xml/security_settings_misc.xml
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-07-28 22:54:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-28 22:45:16 +0000
commitd197608e8340765e736c234dabffae8d3dc695e1 (patch)
tree3174ad826476e7c93774550056e2bbf3260086c0 /res/xml/security_settings_misc.xml
parent6207391ac240d130194f1a0cad7b5f10535d45ac (diff)
parent1d5b910f1c538f266342eb112cb5d4af04099a5c (diff)
downloadpackages_apps_Settings-d197608e8340765e736c234dabffae8d3dc695e1.zip
packages_apps_Settings-d197608e8340765e736c234dabffae8d3dc695e1.tar.gz
packages_apps_Settings-d197608e8340765e736c234dabffae8d3dc695e1.tar.bz2
Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev
Diffstat (limited to 'res/xml/security_settings_misc.xml')
-rw-r--r--res/xml/security_settings_misc.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index ed63028..7219a6c 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/security_settings_title">
<PreferenceCategory android:key="sim_lock"
android:title="@string/sim_lock_settings_title"