upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-07 03:53:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix comment for daebe51be6dc

Browse Source
This commit is contained in:
Jimmy Shih
2011-11-18 14:42:54 -08:00
parent 5aea1348f6
commit 8b2f2b21cd
2 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/services/tasks/StatusAnnouncerTask.java
+12 -4
View File
@@ -185,8 +185,8 @@ public class StatusAnnouncerTask implements PeriodicTask {
: R.plurals.voiceSpeedMilesPerHour;
speed = context.getResources().getQuantityString(speedId, getQuantityCount(s), s);
} else {
int perDistancelId = metricUnits ? R.string.voice_per_kilometer : R.string.voice_per_mile;
speed = getAnnounceTime((long) s) + " " + context.getString(perDistancelId);
int paceId = metricUnits ? R.string.voice_pace_per_kilometer : R.string.voice_pace_per_mile;
speed = String.format(context.getString(paceId), getAnnounceTime((long) s));
}
int totalDistanceId = metricUnits ? R.plurals.voiceTotalDistanceKilometers
@@ -199,8 +199,16 @@ public class StatusAnnouncerTask implements PeriodicTask {
}
/**
* Gets the plural count to be used by getQuantityString.
*
* Gets the plural count to be used by getQuantityString. getQuantityString
* only supports integer quantities, not a double quantity like "2.2".
* <p>
* As a temporary workaround, we convert a double quantity to an integer
* quantity. If the double quantity is exactly 0, 1, or 2, then we can return
* these integer quantities. Otherwise, we cast the double quantity to an
* integer quantity. However, we need to make sure that if the casted value is
* 0, 1, or 2, we don't return those, instead, return the next biggest integer
* 3.
*
* @param d the double value
*/
private int getQuantityCount(double d) {