Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fd359d8 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Move the position of widget choosers to below lockscreen settings in... 

Merge "Move the position of widget choosers to below lockscreen settings in Security" into jb-mr1-dev
parents 992e0b85 8f6060f6

res/xml/security_settings_biometric_weak.xml

+12 −12
Original line number Diff line number Diff line
@@ -26,18 +26,6 @@ 
            android:summary="@string/unlock_set_unlock_mode_biometric_weak"

            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"/>
@@ -67,6 +55,18 @@ 
            android:key="unlock_tactile_feedback"

            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"

res/xml/security_settings_password.xml

+12 −12
Original line number Diff line number Diff line
@@ -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"
@@ -50,6 +38,18 @@ 
            android:key="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

            android:fragment="com.android.settings.OwnerInfoSettings"

            android:key="owner_info_settings"

res/xml/security_settings_pattern.xml

+12 −12
Original line number Diff line number Diff line
@@ -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"/>
@@ -58,6 +46,18 @@ 
            android:key="unlock_tactile_feedback"

            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"

res/xml/security_settings_pin.xml

+12 −12
Original line number Diff line number Diff line
@@ -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"
@@ -54,6 +42,18 @@ 
            android:key="unlock_tactile_feedback"

            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"