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

Commit 6c269982 authored by Evan Charlton's avatar Evan Charlton Committed by Android (Google) Code Review
Browse files

Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev

parents 43635081 673130bb

res/values/strings.xml

+4 −1
Original line number Diff line number Diff line
@@ -33,7 +33,10 @@ 
    <!-- Device Info screen. Used for a status item's value when the proper value is not known -->

    <string name="device_info_default">Unknown</string>

    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->

    <string name="show_dev_countdown">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from being a developer.</string>

    <plurals name="show_dev_countdown">

        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from being a developer.</item>

        <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from being a developer.</item>

    </plurals>

    <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->

    <string name="show_dev_on">You are now a developer!</string>

    <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->

src/com/android/settings/DeviceInfoSettings.java

+2 −2
Original line number Diff line number Diff line
@@ -191,8 +191,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
                    if (mDevHitToast != null) {

                        mDevHitToast.cancel();

                    }

                    mDevHitToast = Toast.makeText(getActivity(), getResources().getString(

                            R.string.show_dev_countdown, mDevHitCountdown),

                    mDevHitToast = Toast.makeText(getActivity(), getResources().getQuantityString(

                            R.plurals.show_dev_countdown, mDevHitCountdown, mDevHitCountdown),

                            Toast.LENGTH_SHORT);

                    mDevHitToast.show();

                }