summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2012-10-04 16:21:36 -0700
committerAmith Yamasani <yamasani@google.com>2012-10-04 16:21:36 -0700
commit8f6060f639dddd4e675b9a93ca841276f0f866c3 (patch)
treed7ce0c6dcaf586f5184d2f339ca88535117f66d0 /res
parent875fa8affb0f3b0ac39120833a7778f92c97b965 (diff)
downloadpackages_apps_settings-8f6060f639dddd4e675b9a93ca841276f0f866c3.zip
packages_apps_settings-8f6060f639dddd4e675b9a93ca841276f0f866c3.tar.gz
packages_apps_settings-8f6060f639dddd4e675b9a93ca841276f0f866c3.tar.bz2
Move the position of widget choosers to below lockscreen settings in Security
Bug: 7261302 Move the 2 widget options on lockscreen to below the lock related items, just above the Owner Info item. Change-Id: I373b915e15bc93ce7e56f5982999afa1e5aed281
Diffstat (limited to 'res')
-rw-r--r--res/xml/security_settings_biometric_weak.xml24
-rw-r--r--res/xml/security_settings_password.xml24
-rw-r--r--res/xml/security_settings_pattern.xml24
-rw-r--r--res/xml/security_settings_pin.xml24
4 files changed, 48 insertions, 48 deletions
diff --git a/res/xml/security_settings_biometric_weak.xml b/res/xml/security_settings_biometric_weak.xml
index 590eb95..c95596b 100644
--- a/res/xml/security_settings_biometric_weak.xml
+++ b/res/xml/security_settings_biometric_weak.xml
@@ -27,18 +27,6 @@
android:persistent="false"/>
<PreferenceScreen
- android:key="choose_lockscreen_status_widget"
- android:title="@string/choose_lockscreen_status_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
- <PreferenceScreen
- android:key="choose_user_selected_lockscreen_widget"
- android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
- <PreferenceScreen
android:key="biometric_weak_improve_matching"
android:title="@string/biometric_weak_improve_matching_title"/>
@@ -68,6 +56,18 @@
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
<PreferenceScreen
+ android:key="choose_lockscreen_status_widget"
+ android:title="@string/choose_lockscreen_status_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="choose_user_selected_lockscreen_widget"
+ android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 5f8425c..a9973fd 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_password"
android:persistent="false"/>
- <PreferenceScreen
- android:key="choose_lockscreen_status_widget"
- android:title="@string/choose_lockscreen_status_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
- <PreferenceScreen
- android:key="choose_user_selected_lockscreen_widget"
- android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
<ListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
@@ -51,6 +39,18 @@
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>
<PreferenceScreen
+ android:key="choose_lockscreen_status_widget"
+ android:title="@string/choose_lockscreen_status_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="choose_user_selected_lockscreen_widget"
+ android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index f8f2ee7..47fa1cc 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_pattern"
android:persistent="false"/>
- <PreferenceScreen
- android:key="choose_lockscreen_status_widget"
- android:title="@string/choose_lockscreen_status_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
- <PreferenceScreen
- android:key="choose_user_selected_lockscreen_widget"
- android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
<CheckBoxPreference
android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
@@ -59,6 +47,18 @@
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
<PreferenceScreen
+ android:key="choose_lockscreen_status_widget"
+ android:title="@string/choose_lockscreen_status_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="choose_user_selected_lockscreen_widget"
+ android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 8f5cdc2..a019125 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_pin"
android:persistent="false"/>
- <PreferenceScreen
- android:key="choose_lockscreen_status_widget"
- android:title="@string/choose_lockscreen_status_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
- <PreferenceScreen
- android:key="choose_user_selected_lockscreen_widget"
- android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
- android:summary=""
- android:persistent="false"/>
-
<ListPreference
android:key="lock_after_timeout"
android:title="@string/lock_after_timeout"
@@ -55,6 +43,18 @@
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/>
<PreferenceScreen
+ android:key="choose_lockscreen_status_widget"
+ android:title="@string/choose_lockscreen_status_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
+ android:key="choose_user_selected_lockscreen_widget"
+ android:title="@string/choose_user_selected_lockscreen_widget_picker_title"
+ android:summary=""
+ android:persistent="false"/>
+
+ <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings"
android:title="@string/owner_info_settings_title"