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

Commit 898671f1 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev

parents 19465fa3 4a9065e6

res/xml/security_settings_biometric_weak.xml

+3 −3
Original line number Diff line number Diff line
@@ -31,12 +31,12 @@ 
            android:key="biometric_weak_improve_matching"

            android:title="@string/biometric_weak_improve_matching_title"/>



        <CheckBoxPreference

        <SwitchPreference

           android:key="biometric_weak_liveliness"

           android:title="@string/biometric_weak_liveliness_title"

           android:summary="@string/biometric_weak_liveliness_summary"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="visiblepattern"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
@@ -48,7 +48,7 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>

res/xml/security_settings_misc.xml

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
    <PreferenceCategory android:title="@string/security_passwords_title"

            android:persistent="false">



        <CheckBoxPreference android:key="show_password"

        <SwitchPreference android:key="show_password"

                android:title="@string/show_password"

                android:persistent="false"/>
@@ -52,7 +52,7 @@ 
                android:persistent="false"

                android:fragment="com.android.settings.DeviceAdminSettings"/>



        <CheckBoxPreference android:key="toggle_install_applications"

        <SwitchPreference android:key="toggle_install_applications"

                android:title="@string/install_applications"

                android:summaryOff="@string/install_unknown_applications"

                android:summaryOn="@string/install_unknown_applications"

res/xml/security_settings_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>

res/xml/security_settings_pattern.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
            android:summary="@string/unlock_set_unlock_mode_pattern"

            android:persistent="false"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="visiblepattern"

            android:title="@string/lockpattern_settings_enable_visible_pattern_title"/>
@@ -39,7 +39,7 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>

res/xml/security_settings_pin.xml

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>



        <CheckBoxPreference

        <SwitchPreference

            android:key="power_button_instantly_locks"

            android:title="@string/lockpattern_settings_enable_power_button_instantly_locks"/>