summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-07-28 15:47:21 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-07-28 15:47:21 -0700
commit1d5b910f1c538f266342eb112cb5d4af04099a5c (patch)
tree47aefe5a3d197a20db08c1fa6d0c3200d674bdd1
parent2ec78636f75964a48be5e95fe9b7e71f2270f917 (diff)
downloadpackages_apps_Settings-1d5b910f1c538f266342eb112cb5d4af04099a5c.zip
packages_apps_Settings-1d5b910f1c538f266342eb112cb5d4af04099a5c.tar.gz
packages_apps_Settings-1d5b910f1c538f266342eb112cb5d4af04099a5c.tar.bz2
Fix bug #14323097 Launching Security from Settings search results
...show header as Settings instead of Security - add missing title to a few fragments Change-Id: I74fb95ca58269ff1c77afa20ed40e7042873130c
-rw-r--r--res/xml/security_settings_biometric_weak.xml3
-rw-r--r--res/xml/security_settings_chooser.xml3
-rw-r--r--res/xml/security_settings_encrypted.xml3
-rw-r--r--res/xml/security_settings_lockscreen.xml3
-rw-r--r--res/xml/security_settings_misc.xml3
-rw-r--r--res/xml/security_settings_password.xml3
-rw-r--r--res/xml/security_settings_pattern.xml3
-rw-r--r--res/xml/security_settings_pin.xml3
-rw-r--r--res/xml/security_settings_unencrypted.xml3
9 files changed, 18 insertions, 9 deletions
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index c663492..750a270 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.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="security_category"
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index d17366e..4c1d809 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.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="security_category"
diff --git a/res/xml/security_settings_encrypted.xml b/res/xml/security_settings_encrypted.xml
index 37452f6..2399243 100644
--- a/res/xml/security_settings_encrypted.xml
+++ b/res/xml/security_settings_encrypted.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="security_category"
diff --git a/res/xml/security_settings_lockscreen.xml b/res/xml/security_settings_lockscreen.xml
index abf06e3..ae98c4e 100644
--- a/res/xml/security_settings_lockscreen.xml
+++ b/res/xml/security_settings_lockscreen.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="security_category"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 1fa8b9a..e8009b4 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"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index b418aa7..bb9c360 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.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/lock_settings_picker_title">
<PreferenceCategory
android:key="security_category"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index d47a99d..168a685 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.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/lock_settings_picker_title">
<PreferenceCategory
android:key="security_category"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index c1aac48..4ead03f 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.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/lock_settings_picker_title">
<PreferenceCategory
android:key="security_category"
diff --git a/res/xml/security_settings_unencrypted.xml b/res/xml/security_settings_unencrypted.xml
index 947317c..a907249 100644
--- a/res/xml/security_settings_unencrypted.xml
+++ b/res/xml/security_settings_unencrypted.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/crypt_keeper_settings_title">
<PreferenceCategory
android:key="security_category"