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

Commit 161426e4 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'froyo' of http://github.com/Wysie/android_packages_apps_Settings into froyo

parents 4fc44fb2 b8149e1a

res/values/arrays.xml

+17 −0
Original line number Diff line number Diff line
@@ -18,6 +18,23 @@ 
*/

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <string-array name="incorrect_delay_entries">

        <item>No delay</item>

        <item>0.5 seconds</item>

        <item>1 second</item>

        <item>1.5 seconds</item>

        <item>2 seconds</item>

    </string-array>



    <string-array name="incorrect_delay_values">

        <item>0</item>

        <item>500</item>

        <item>1000</item>

        <item>1500</item>

        <item>2000</item>

    </string-array>



    <!-- Choices for timezone picker first level.

         These values will be used as search terms for TimeZone displayName

         strings. --> <skip />

res/values/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -1591,6 +1591,15 @@ 
    <!-- Security & location settings screen, change unlock pattern screen countdown hint on bottom of screen after too many incorrect attempts -->

    <string name="lockpattern_too_many_failed_confirmation_attempts_footer">Try again in <xliff:g id="number">%d</xliff:g> seconds.</string>

    

    <string name="lockpattern_settings_enable_visible_dots_title">Use visible dots</string>

    <string name="lockpattern_settings_show_error_path">Show incorrect path on error</string>

    <string name="lockpattern_settings_show_unlock_msg">Show unlock message</string>

    <string name="lockpattern_settings_show_unlock_error_msg">Show unlock error messages</string>

    <string name="lockpattern_settings_show_custom_msg">Show custom message</string>

    <string name="lockpattern_settings_custom_msg">Custom message</string>

    <string name="lockpattern_settings_custom_msg_dialog">Enter a custom message</string>

    <string name="lockpattern_settings_incorrect_delay_title">Set incorrect pattern delay</string>



    <!-- ChooseLockPatternTutorial --> <skip />

    <!-- ChooseLockPatternTutorial, button labels: This is to cancel the tutorial -->

    <string name="skip_button_label">Cancel</string>

res/xml/security_settings_chooser.xml

+9 −0
Original line number Diff line number Diff line
@@ -26,6 +26,15 @@ 
            android:summary="@string/unlock_set_unlock_launch_picker_summary"

            android:persistent="false"/>

            

        <CheckBoxPreference

            android:key="showcustommsg"

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

            

        <EditTextPreference

            android:key="custommsg"

            android:title="@string/lockpattern_settings_custom_msg"

            android:dialogTitle="@string/lockpattern_settings_custom_msg_dialog"/>



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_password.xml

+9 −0
Original line number Diff line number Diff line
@@ -30,6 +30,15 @@ 
            android:key="unlock_tactile_feedback"

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

            

        <CheckBoxPreference

            android:key="showcustommsg"

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

            

        <EditTextPreference

            android:key="custommsg"

            android:title="@string/lockpattern_settings_custom_msg"

            android:dialogTitle="@string/lockpattern_settings_custom_msg_dialog"/>



    </PreferenceCategory>



</PreferenceScreen>

res/xml/security_settings_pattern.xml

+31 −0
Original line number Diff line number Diff line
@@ -34,6 +34,37 @@ 
            android:key="unlock_tactile_feedback"

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

            

        <CheckBoxPreference

            android:key="visibledots"

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

            

        <CheckBoxPreference

            android:key="showerrorpath"

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

            

        <CheckBoxPreference

            android:key="showunlockmsg"

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

            

        <CheckBoxPreference

            android:key="showunlockerrmsg"

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

            

        <CheckBoxPreference

            android:key="showcustommsg"

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

            

        <EditTextPreference

            android:key="custommsg"

            android:title="@string/lockpattern_settings_custom_msg"

            android:dialogTitle="@string/lockpattern_settings_custom_msg_dialog"/>

            

        <ListPreference

            android:key="incorrectdelay"

            android:title="@string/lockpattern_settings_incorrect_delay_title"

            android:entries="@array/incorrect_delay_entries"

            android:entryValues="@array/incorrect_delay_values"/>            



    </PreferenceCategory>



</PreferenceScreen>