diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-04-20 17:03:52 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2015-04-20 17:04:59 +0000 |
| commit | 5a36f84302842e46eab046650c8077d30de148f5 (patch) | |
| tree | 3388089305e9511f6c3521384c733864ef8a8949 /InCallUI | |
| parent | 3e76471d9cea97fd29cd2b39dde6d03d4e84786f (diff) | |
| parent | 51a1a58aff377124b5d9722469b43213f011e383 (diff) | |
Merge "DO NOT MERGE Stop using internal plural resources" into m-wireless-dev
Diffstat (limited to 'InCallUI')
| -rw-r--r-- | InCallUI/res/values/strings.xml | 16 | ||||
| -rw-r--r-- | InCallUI/src/com/android/incallui/InCallDateUtils.java | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/InCallUI/res/values/strings.xml b/InCallUI/res/values/strings.xml index b8a84c70c..f55945c50 100644 --- a/InCallUI/res/values/strings.xml +++ b/InCallUI/res/values/strings.xml @@ -457,4 +457,20 @@ <string name="video_quality_low" translatable="false">Low</string> <!-- Video quality Unknown --> <string name="video_quality_unknown" translatable="false">Unknown</string> + + <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] --> + <plurals name="duration_seconds"> + <item quantity="one">1 second</item> + <item quantity="other"><xliff:g id="count">%d</xliff:g> seconds</item> + </plurals> + <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] --> + <plurals name="duration_minutes"> + <item quantity="one">1 minute</item> + <item quantity="other"><xliff:g id="count">%d</xliff:g> minutes</item> + </plurals> + <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] --> + <plurals name="duration_hours"> + <item quantity="one">1 hour</item> + <item quantity="other"><xliff:g id="count">%d</xliff:g> hours</item> + </plurals> </resources> diff --git a/InCallUI/src/com/android/incallui/InCallDateUtils.java b/InCallUI/src/com/android/incallui/InCallDateUtils.java index 88c5354c0..156eea06f 100644 --- a/InCallUI/src/com/android/incallui/InCallDateUtils.java +++ b/InCallUI/src/com/android/incallui/InCallDateUtils.java @@ -33,22 +33,19 @@ public class InCallDateUtils { final Resources res = Resources.getSystem(); StringBuilder duration = new StringBuilder(); if (hours > 0) { - duration.append(res.getQuantityString( - com.android.internal.R.plurals.duration_hours, hours, hours)); + duration.append(res.getQuantityString(R.plurals.duration_hours, hours, hours)); } if (minutes > 0) { if (hours > 0) { duration.append(' '); } - duration.append(res.getQuantityString( - com.android.internal.R.plurals.duration_minutes, minutes, minutes)); + duration.append(res.getQuantityString(R.plurals.duration_minutes, minutes, minutes)); } if (seconds > 0) { if (hours > 0 || minutes > 0) { duration.append(' '); } - duration.append(res.getQuantityString( - com.android.internal.R.plurals.duration_seconds, seconds, seconds)); + duration.append(res.getQuantityString(R.plurals.duration_seconds, seconds, seconds)); } return duration.toString(); } |