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

Commit c283ba74 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Fix "too many attempts" pluralization on bouncer"

parents 71beb06f e01c5e1a

core/res/res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -3865,7 +3865,10 @@ 
    <!-- Message shown when user enters wrong PIN -->

    <string name="kg_wrong_pin">Wrong PIN</string>

    <!-- Countdown message shown after too many failed unlock attempts -->

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

    <plurals name="kg_too_many_failed_attempts_countdown">

        <item quantity="one">Try again in 1 second.</item>

        <item quantity="other">Try again in <xliff:g id="number">%d</xliff:g> seconds.</item>

    </plurals>

    <!-- Instructions for using the pattern unlock screen -->

    <string name="kg_pattern_instructions">Draw your pattern</string>

    <!-- Instructions for using the SIM PIN unlock screen -->

packages/SystemUI/res-keyguard/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -133,7 +133,10 @@ 
    <!-- Message shown when user enters wrong PIN -->

    <string name="kg_wrong_pin">Wrong PIN</string>

    <!-- Countdown message shown after too many failed unlock attempts -->

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

    <plurals name="kg_too_many_failed_attempts_countdown">

        <item quantity="one">Try again in 1 second.</item>

        <item quantity="other">Try again in <xliff:g id="number">%d</xliff:g> seconds.</item>

    </plurals>

    <!-- Instructions for using the pattern unlock screen -->

    <string name="kg_pattern_instructions">Draw your pattern</string>

    <!-- Instructions for using the SIM PIN unlock screen -->

packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java

+3 −2
Original line number Diff line number Diff line
@@ -223,8 +223,9 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout 
            @Override

            public void onTick(long millisUntilFinished) {

                int secondsRemaining = (int) Math.round(millisUntilFinished / 1000.0);

                mSecurityMessageDisplay.formatMessage(

                        R.string.kg_too_many_failed_attempts_countdown, secondsRemaining);

                mSecurityMessageDisplay.setMessage(mContext.getResources().getQuantityString(

                        R.plurals.kg_too_many_failed_attempts_countdown,

                        secondsRemaining, secondsRemaining));

            }



            @Override

packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java

+3 −2
Original line number Diff line number Diff line
@@ -332,8 +332,9 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
            @Override

            public void onTick(long millisUntilFinished) {

                final int secondsRemaining = (int) Math.round(millisUntilFinished / 1000.0);

                mSecurityMessageDisplay.formatMessage(

                        R.string.kg_too_many_failed_attempts_countdown, secondsRemaining);

                mSecurityMessageDisplay.setMessage(mContext.getResources().getQuantityString(

                                R.plurals.kg_too_many_failed_attempts_countdown,

                                secondsRemaining, secondsRemaining));

            }



            @Override