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

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

Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo

parents 3957b3c1 bbb4afa1

AndroidManifest.xml

+5 −4
Original line number Diff line number Diff line
@@ -491,8 +491,7 @@ 
            android:theme="@android:style/Theme.NoTitleBar">

        </activity>



        <activity android:name="ChooseLockGeneric"

                android:theme="@android:style/Theme.NoDisplay">

        <activity android:name="ChooseLockGeneric">

            <intent-filter>

                <action android:name="android.app.action.SET_NEW_PASSWORD" />

                <category android:name="android.intent.category.DEFAULT" />
@@ -500,12 +499,14 @@ 
        </activity>



        <activity android:name="ChooseLockPattern"

                android:label="@string/lockpattern_change_lock_pattern_label">

                android:label="@string/lockpattern_change_lock_pattern_label"

                android:exported="false">

        </activity>



        <activity android:name="ChooseLockPassword"

                android:label="@string/lockpattern_change_lock_pin_label"

            android:theme="@android:style/Theme.NoTitleBar">

            android:theme="@android:style/Theme.NoTitleBar"

            android:exported="false">

        </activity>



        <activity android:name="ChooseLockPatternTutorial"

res/values/strings.xml

+36 −8
Original line number Diff line number Diff line
@@ -514,6 +514,8 @@ 
    <!-- Menu item on Select time zone screen -->

    <string name="zone_list_menu_sort_by_timezone">Sort by time zone</string>



    <!-- Security Settings --><skip />



    <!-- Main Settings screen setting option title for the item to take you the security and location screen -->

    <string name="security_settings_title">Location &amp; security</string>

    <!-- Location & security settings screen title -->
@@ -525,23 +527,49 @@ 
    <!-- In the security screen, the header title for settings related to  Passwords-->

    <string name="security_passwords_title">Passwords</string>



    <!-- Unlock Picker Settings --><skip />



    <!-- Security Picker --><skip />

    <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password -->

    <string name="lock_settings_picker_title">Screen unlock security</string>



    <!--  Main Security lock settings --><skip />

    <!--  Title for PreferenceScreen to launch picker for security method when there is none -->

    <string name="unlock_set_unlock_launch_picker_title">Set up screen lock</string>



    <!--  Summary for PreferenceScreen to launch picker for security method when there is none -->

    <string name="unlock_set_unlock_launch_picker_summary">Lock screen with a pattern, PIN, or password</string>



    <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password  -->

    <string name="unlock_set_unlock_launch_picker_change_title">Change screen lock</string>



    <!-- Unlock settings --><skip />

    <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password  -->

    <string name="unlock_set_unlock_launch_picker_change_summary">Change or disable pattern, PIN, or password security</string>



    <!-- Title for preference that will guide the user through creating an unlock pattern -->

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



    <!-- Title for preference that disables unlock security -->

    <string name="unlock_set_unlock_none_title">None</string>

    <!-- Summary for preference that disables unlock security -->

    <string name="unlock_set_unlock_none_summary">Disable screen unlock security</string>



    <!-- Title for preference that guides the user through creating an unlock pattern -->

    <string name="unlock_set_unlock_pattern_title">Pattern</string>

    <!-- Summary for preference that guides the user through creating an unlock pattern -->

    <string name="unlock_set_unlock_pattern_summary">Must draw pattern to unlock screen</string>

    <string name="unlock_set_unlock_pattern_summary">Draw pattern to unlock screen</string>



    <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->

    <string name="unlock_set_unlock_pin_title">Set unlock PIN</string>

    <string name="unlock_set_unlock_pin_title">PIN</string>

    <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number)  -->

    <string name="unlock_set_unlock_pin_summary">Must use a numeric PIN to unlock screen</string>

    <string name="unlock_set_unlock_pin_summary">Enter a numeric PIN to unlock screen</string>



    <!-- Title for preference that guides the user through creating an unlock password -->

    <string name="unlock_set_unlock_password_title">Set unlock password</string>

    <string name="unlock_set_unlock_password_title">Password</string>

    <!-- Title for preference that guides the user through creating an unlock password -->

    <string name="unlock_set_unlock_password_summary">Must use a password to unlock screen</string>

    <string name="unlock_set_unlock_password_summary">Enter a password to unlock screen</string>



    <!-- Summary for preference that has been disabled by DevicePolicyAdmin -->

    <string name="unlock_set_unlock_disabled_summary">Disable by device policy</string>





    <!-- Title for option to turn of password/pin/pattern unlock. -->

    <string name="unlock_disable_lock_title">Turn off screen lock</string>

res/xml/security_settings_chooser.xml

+3 −15
Original line number Diff line number Diff line
@@ -21,21 +21,9 @@ 
        android:title="@string/lock_settings_title">



        <PreferenceScreen

            android:key="unlock_set_pattern"

            android:title="@string/unlock_set_unlock_pattern_title"

            android:summary="@string/unlock_set_unlock_pattern_summary"

            android:persistent="false"/>



        <PreferenceScreen

            android:key="unlock_set_pin"

            android:title="@string/unlock_set_unlock_pin_title"

            android:summary="@string/unlock_set_unlock_pin_summary"

            android:persistent="false"/>



        <PreferenceScreen

            android:key="unlock_set_password"

            android:title="@string/unlock_set_unlock_password_title"

            android:summary="@string/unlock_set_unlock_password_summary"

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_title"

            android:summary="@string/unlock_set_unlock_launch_picker_summary"

            android:persistent="false"/>



    </PreferenceCategory>

res/xml/security_settings_password.xml

+3 −8
Original line number Diff line number Diff line
@@ -21,14 +21,9 @@ 
        android:title="@string/lock_settings_title">



        <PreferenceScreen

            android:key="unlock_method_disable"

            android:title="@string/unlock_disable_lock_title"

            android:summary="@string/unlock_disable_lock_password_summary"

            android:persistent="false"/>



        <PreferenceScreen

            android:key="unlock_method_change_current"

            android:title="@string/unlock_change_lock_password_title"

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_change_title"

            android:summary="@string/unlock_set_unlock_launch_picker_change_summary"

            android:persistent="false"/>



        <CheckBoxPreference

res/xml/security_settings_pattern.xml

+3 −8
Original line number Diff line number Diff line
@@ -21,14 +21,9 @@ 
        android:title="@string/lock_settings_title">



        <PreferenceScreen

            android:key="unlock_method_disable"

            android:title="@string/unlock_disable_lock_title"

            android:summary="@string/unlock_disable_lock_pattern_summary"

            android:persistent="false"/>



        <PreferenceScreen

            android:key="unlock_method_change_current"

            android:title="@string/unlock_change_lock_pattern_title"

            android:key="unlock_set_or_change"

            android:title="@string/unlock_set_unlock_launch_picker_change_title"

            android:summary="@string/unlock_set_unlock_launch_picker_change_summary"

            android:persistent="false"/>



        <CheckBoxPreference