am a835f66e: am b71b78a4: am 6c269982: Merge "Use plurals for the developer steps countdown" into jb-mr1.1-dev
* commit 'a835f66ec736b7c2cdf4ca433f70161ef2290359':
Use plurals for the developer steps countdown
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d070c6e..e55d577 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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 -->
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index a4abfea..d2ff6db 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -191,8 +191,8 @@
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();
}