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

Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-04 21:56:04 -07:00
committed by Android (Google) Code Review
parent 992e0b8537 8f6060f639
commit 6fd359d8f6
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
res/xml/security_settings_biometric_weak.xml
View File

@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_biometric_weak" android:summary="@string/unlock_set_unlock_mode_biometric_weak"
android:persistent="false"/> 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 <PreferenceScreen
android:key="biometric_weak_improve_matching" android:key="biometric_weak_improve_matching"
android:title="@string/biometric_weak_improve_matching_title"/> android:title="@string/biometric_weak_improve_matching_title"/>
@@ -67,6 +55,18 @@
android:key="unlock_tactile_feedback" android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/> 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 <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings" android:key="owner_info_settings"

24
res/xml/security_settings_password.xml
View File

@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_password" android:summary="@string/unlock_set_unlock_mode_password"
android:persistent="false"/> 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 <ListPreference
android:key="lock_after_timeout" android:key="lock_after_timeout"
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
@@ -50,6 +38,18 @@
android:key="power_button_instantly_locks" android:key="power_button_instantly_locks"
android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/> 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 <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings" android:key="owner_info_settings"

24
res/xml/security_settings_pattern.xml
View File

@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_pattern" android:summary="@string/unlock_set_unlock_mode_pattern"
android:persistent="false"/> 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 <CheckBoxPreference
android:key="visiblepattern" android:key="visiblepattern"
android:title="@string/lockpattern_settings_enable_visible_pattern_title"/> android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
@@ -58,6 +46,18 @@
android:key="unlock_tactile_feedback" android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/> 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 <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings" android:key="owner_info_settings"

24
res/xml/security_settings_pin.xml
View File

@@ -26,18 +26,6 @@
android:summary="@string/unlock_set_unlock_mode_pin" android:summary="@string/unlock_set_unlock_mode_pin"
android:persistent="false"/> 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 <ListPreference
android:key="lock_after_timeout" android:key="lock_after_timeout"
android:title="@string/lock_after_timeout" android:title="@string/lock_after_timeout"
@@ -54,6 +42,18 @@
android:key="unlock_tactile_feedback" android:key="unlock_tactile_feedback"
android:title="@string/lockpattern_settings_enable_tactile_feedback_title"/> 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 <PreferenceScreen
android:fragment="com.android.settings.OwnerInfoSettings" android:fragment="com.android.settings.OwnerInfoSettings"
android:key="owner_info_settings" android:key="owner_info_settings"