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

Commit 340990a2 authored by Jim Miller's avatar Jim Miller Committed by Android Git Automerger
Browse files

am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 

* commit 'af487099':
  Fix 4560303: Add setting to lock later when power button pressed
parents 79ffc669 af487099

res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2226,6 +2226,8 @@ 
    <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>

    <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>

    <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->

    <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->

    <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on touch</string>

    <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on touch</string>

    <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->

    <string name="lockpattern_settings_enable_power_button_instantly_locks">Power button instantly locks</string>

    <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->

    <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->

    <string name="lockpattern_settings_choose_lock_pattern">Set unlock pattern</string>

    <string name="lockpattern_settings_choose_lock_pattern">Set unlock pattern</string>

    <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->

    <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->

res/xml/security_settings_biometric_weak.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>

            android:persistent="false"/>





        <CheckBoxPreference

            android:key="power_button_instantly_locks"

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



        <CheckBoxPreference

        <CheckBoxPreference

            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"/>

res/xml/security_settings_password.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,10 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>

            android:persistent="false"/>





        <CheckBoxPreference

            android:key="power_button_instantly_locks"

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



        <PreferenceScreen

        <PreferenceScreen

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

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

            android:key="owner_info_settings"

            android:key="owner_info_settings"

res/xml/security_settings_pattern.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,10 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>

            android:persistent="false"/>





        <CheckBoxPreference

            android:key="power_button_instantly_locks"

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



        <CheckBoxPreference

        <CheckBoxPreference

            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"/>

res/xml/security_settings_pin.xml

+4 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,10 @@ 
            android:entryValues="@array/lock_after_timeout_values"

            android:entryValues="@array/lock_after_timeout_values"

            android:persistent="false"/>

            android:persistent="false"/>





        <CheckBoxPreference

            android:key="power_button_instantly_locks"

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



        <CheckBoxPreference

        <CheckBoxPreference

            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"/>