PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d197608e: Merge "Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security" into lmp-dev

Browse Source 
* commit 'd197608e8340765e736c234dabffae8d3dc695e1':
  Fix bug #14323097 Launching Security from Settings search results ...show header as Settings instead of Security
This commit is contained in:
Fabrice Di Meglio
2014-07-28 23:15:47 +00:00
committed by Android Git Automerger
parent 92126c1c9c d197608e83
commit 90bfe0cf7e
9 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/security_settings_biometric_weak.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_chooser.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_encrypted.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_lockscreen.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_misc.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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" <PreferenceCategory android:key="sim_lock"
android:title="@string/sim_lock_settings_title" android:title="@string/sim_lock_settings_title"

3
res/xml/security_settings_password.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_pattern.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_pin.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"

3
res/xml/security_settings_unencrypted.xml
View File

@@ -14,7 +14,8 @@
limitations under the License. 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 <PreferenceCategory
android:key="security_category" android:key="security_category"