diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml index bb683f23f..cad4a007a 100644 --- a/MyTracks/res/layout/mytracks_waypoint_details.xml +++ b/MyTracks/res/layout/mytracks_waypoint_details.xml @@ -125,7 +125,7 @@ limitations under the License. android:layout_column="2" android:layout_marginBottom="-9dip" android:layout_marginTop="-9dip" - android:text="@string/mile" + android:text="@string/unit_mile" android:textColor="@color/stat_label_text" /> Stunde Stunden - Std - Min + Std + Min Minute Minuten Sekunde @@ -315,11 +315,11 @@ limitations under the License. - - + + Kilometer - Fuß - + Fuß + Meilen diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml index f02628df0..2e6923f61 100644 --- a/MyTracks/res/values-es/strings.xml +++ b/MyTracks/res/values-es/strings.xml @@ -382,7 +382,7 @@ limitations under the License. kilómetros - pies + pies millas diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml index 3a383c2db..9929e7f53 100644 --- a/MyTracks/res/values-fi/strings.xml +++ b/MyTracks/res/values-fi/strings.xml @@ -356,8 +356,8 @@ limitations under the License. tunti tuntia - h - min + h + min minuutti minuuttia sekunti @@ -365,11 +365,11 @@ limitations under the License. ms - m - km + m + km kilometriä - ft - mi + ft + mi mailia diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml index c4323c9cc..034e017f6 100644 --- a/MyTracks/res/values-fr/strings.xml +++ b/MyTracks/res/values-fr/strings.xml @@ -286,7 +286,7 @@ limitations under the License. secondes - pied + pied kilomètres milles diff --git a/MyTracks/res/values-it/strings.xml b/MyTracks/res/values-it/strings.xml index a7e1cee87..eef86e8e7 100644 --- a/MyTracks/res/values-it/strings.xml +++ b/MyTracks/res/values-it/strings.xml @@ -261,19 +261,19 @@ limitations under the License. ora ore - h - min + h + min minuto minuti secondo secondi - m - km + m + km chilometri - pd - mi + pd + mi miglia diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml index e6db12ed4..1c43bdf28 100644 --- a/MyTracks/res/values-ja/strings.xml +++ b/MyTracks/res/values-ja/strings.xml @@ -344,8 +344,8 @@ limitations under the License. 時 時 - 時 - 分 + 時 + 分 分 分 秒 diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml index 04476e5ab..3870dd830 100644 --- a/MyTracks/res/values-pl/strings.xml +++ b/MyTracks/res/values-pl/strings.xml @@ -289,19 +289,19 @@ limitations under the License. godzina godziny - godz. - min + godz. + min minuta minuty sekunda sekundy - m - km + m + km kilometerów - st. - mi + st. + mi mil diff --git a/MyTracks/res/values-pt-rBR/strings.xml b/MyTracks/res/values-pt-rBR/strings.xml index cafacd775..f7c29ade4 100644 --- a/MyTracks/res/values-pt-rBR/strings.xml +++ b/MyTracks/res/values-pt-rBR/strings.xml @@ -248,14 +248,14 @@ limitations under the License. hora horas - h + h minuto minutos segundo segundos - pés + pés kilômetros milhas diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml index 58ed69fce..f780e3ef5 100644 --- a/MyTracks/res/values-ru/strings.xml +++ b/MyTracks/res/values-ru/strings.xml @@ -352,8 +352,8 @@ limitations under the License. час часов - ч - мин + ч + мин минута минут секунда @@ -361,11 +361,11 @@ limitations under the License. мс - м - км + м + км километров - футов - миль + футов + миль мили diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml index f94b0c575..c1d579373 100644 --- a/MyTracks/res/values-sv/strings.xml +++ b/MyTracks/res/values-sv/strings.xml @@ -264,19 +264,19 @@ limitations under the License. timme timmar - tim - min + tim + min minut minuter sekund sekunder - m - km + m + km kilometer - ft - mi + ft + mi miles diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml index 238a9afa2..bf31481c4 100644 --- a/MyTracks/res/values-zh-rCN/strings.xml +++ b/MyTracks/res/values-zh-rCN/strings.xml @@ -353,8 +353,8 @@ limitations under the License. 小时 小时 - 时 - 分 + 时 + 分 分钟 分钟 秒 diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 67dd5ebb9..cb701b6a3 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -1313,39 +1313,117 @@ limitations under the License. seconds - - - hr - - - s - - - - min - - - - - km - - - m - - - mi - - + ft + + hr + + + km + + + m + + + mi + + + min + + + + adapt for accuracy + + + adapt for battery life + + + Always + + + %.1f mi + + + %.1f mi (poor GPS) + + + %d ft + + + %d ft (excellent GPS) + + + %d ft (recommended) + + + %d km + + + %d m + + + %d m (excellent GPS) + + + %d m (poor GPS) + + + %d m (recommended) + + + %d mi + + + %d min + + + %d s + + + Never + + + Off + + + smallest (recommended) + + @@ -1668,52 +1746,8 @@ limitations under the License. speed thresholds. E.g., use one color for segments where the speed is below the average speed of the track."> Dynamic Thresholds - - - - - - Always - - - Off - - - recommended - - - excellent GPS - - - poor GPS - - - battery life (adaptive) - - high accuracy (adaptive) - - - highest - - + diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java index 428df8310..51734556f 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ChartView.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ChartView.java @@ -832,8 +832,8 @@ public class ChartView extends View { canvas.drawLine(leftBorder, y, rightEdge, y, borderPaint); Context c = getContext(); String s = mode == Mode.BY_DISTANCE - ? (metricUnits ? c.getString(R.string.kilometer) : c.getString(R.string.mile)) - : c.getString(R.string.min); + ? (metricUnits ? c.getString(R.string.unit_kilometer) : c.getString(R.string.unit_mile)) + : c.getString(R.string.unit_minute); canvas.drawText(s, rightEdge, effectiveHeight + .2f * UNIT_BORDER + topBorder, labelPaint); } @@ -852,7 +852,7 @@ public class ChartView extends View { Context c = getContext(); // TODO: This should really show units for all series. - String s = metricUnits ? c.getString(R.string.meter) : c.getString(R.string.feet); + String s = metricUnits ? c.getString(R.string.unit_meter) : c.getString(R.string.unit_feet); canvas.drawText(s, leftBorder - UNIT_BORDER * .2f, UNIT_BORDER * .8f + topBorder, labelPaint); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java index 436574ea0..e01073168 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/SettingsActivity.java @@ -123,20 +123,21 @@ public class SettingsActivity extends PreferenceActivity { String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { if (values[i].equals("-2")) { - options[i] = getString(R.string.min_recording_interval_adaptive_battery); + options[i] = getString(R.string.value_adapt_battery_life); } else if (values[i].equals("-1")) { - options[i] = getString(R.string.min_recording_interval_adaptive_accuracy); + options[i] = getString(R.string.value_adapt_accuracy); } else if (values[i].equals("0")) { - options[i] = getString(R.string.min_recording_interval_highest) + " (" - + getString(R.string.settings_recommended) + ")"; + options[i] = getString(R.string.value_smallest_recommended); } else { int value = Integer.parseInt(values[i]); + String format; if (value < 60) { - options[i] = value + " " + getString(R.string.second); + format = getString(R.string.value_integer_second); } else { value = value / 60; - options[i] = value + " " + getString(R.string.min); + format = getString(R.string.value_integer_minute); } + options[i] = String.format(format, value); } } ListPreference list = (ListPreference) findPreference( @@ -152,11 +153,13 @@ public class SettingsActivity extends PreferenceActivity { String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { if (values[i].equals("0")) { - options[i] = getString(R.string.auto_resume_track_timeout_never); + options[i] = getString(R.string.value_never); } else if (values[i].equals("-1")) { - options[i] = getString(R.string.auto_resume_track_timeout_always); + options[i] = getString(R.string.value_always); } else { - options[i] = values[i] + " " + getString(R.string.min); + int value = Integer.parseInt(values[i]); + String format = getString(R.string.value_integer_minute); + options[i] = String.format(format, value); } } ListPreference list = (ListPreference) findPreference( @@ -423,16 +426,20 @@ public class SettingsActivity extends PreferenceActivity { * Sets the display options for a periodic task. */ private void setTaskOptions(boolean isMetric, int listId) { - String distanceUnit = isMetric ? getString(R.string.kilometer) : getString(R.string.mile); String[] values = getResources().getStringArray(R.array.task_frequency_values); String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { if (values[i].equals("0")) { - options[i] = getString(R.string.task_frequency_off); + options[i] = getString(R.string.value_off); } else if (values[i].startsWith("-")) { - options[i] = values[i].substring(1) + " " + distanceUnit; + int value = Integer.parseInt(values[i].substring(1)); + String format = isMetric ? getString(R.string.value_integer_kilometer) + : getString(R.string.value_integer_mile); + options[i] = String.format(format, value); } else { - options[i] = values[i] + " " + getString(R.string.minute); + int value = Integer.parseInt(values[i]); + String format = getString(R.string.value_integer_minute); + options[i] = String.format(format, value); } } @@ -444,7 +451,6 @@ public class SettingsActivity extends PreferenceActivity { * Sets the display options for min distance between points. */ private void setMinDistanceOptions(boolean isMetric, int listId) { - String unit = isMetric ? getString(R.string.meter) : getString(R.string.feet); String[] values = getResources().getStringArray(R.array.min_recording_distance_values); String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { @@ -452,10 +458,15 @@ public class SettingsActivity extends PreferenceActivity { if (!isMetric) { value = (int) (value * UnitConversions.M_TO_FT); } - options[i] = value + " " + unit; + String format; if (values[i].equals("5")) { - options[i] += " (" + getString(R.string.settings_recommended) + ")"; + format = isMetric ? getString(R.string.value_integer_meter_recommended) + : getString(R.string.value_integer_feet_recommended); + } else { + format = isMetric ? getString(R.string.value_integer_meter) + : getString(R.string.value_integer_feet); } + options[i] = String.format(format, value); } ListPreference list = (ListPreference) findPreference(getString(listId)); @@ -470,21 +481,29 @@ public class SettingsActivity extends PreferenceActivity { String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { int value = Integer.parseInt(values[i]); + String format; if (isMetric) { - options[i] = value + " " + getString(R.string.meter); + if (values[i].equals("200")) { + format = getString(R.string.value_integer_meter_recommended); + } else { + format = getString(R.string.value_integer_meter); + } + options[i] = String.format(format, value); } else { value = (int) (value * UnitConversions.M_TO_FT); if (value < 2000) { - options[i] = value + " " + getString(R.string.feet); + if (values[i].equals("200")) { + format = getString(R.string.value_integer_feet_recommended); + } else { + format = getString(R.string.value_integer_feet); + } + options[i] = String.format(format, value); } else { - double mileValue = value / UnitConversions.MI_TO_FEET; - mileValue = (int) (mileValue * 10) / 10.0; - options[i] = mileValue + " " + getString(R.string.mile); + double mile = value / UnitConversions.MI_TO_FEET; + format = getString(R.string.value_float_mile); + options[i] = String.format(format, mile); } - } - if (values[i].equals("200")) { - options[i] += " (" + getString(R.string.settings_recommended) + ")"; - } + } } ListPreference list = (ListPreference) findPreference(getString(listId)); @@ -499,27 +518,40 @@ public class SettingsActivity extends PreferenceActivity { String[] options = new String[values.length]; for (int i = 0; i < values.length; i++) { int value = Integer.parseInt(values[i]); + String format; if (isMetric) { - options[i] = value + " " + getString(R.string.meter); + if (values[i].equals("200")) { + format = getString(R.string.value_integer_meter_recommended); + } else if (values[i].equals("10")) { + format = getString(R.string.value_integer_meter_excellent_gps); + } else if (values[i].equals("5000")) { + format = getString(R.string.value_integer_meter_poor_gps); + } else { + format = getString(R.string.value_integer_meter); + } + options[i] = String.format(format, value); } else { value = (int) (value * UnitConversions.M_TO_FT); if (value < 2000) { - options[i] = value + " " + getString(R.string.feet); + if (values[i].equals("200")) { + format = getString(R.string.value_integer_feet_recommended); + } else if (values[i].equals("10")) { + format = getString(R.string.value_integer_feet_excellent_gps); + } else { + format = getString(R.string.value_integer_feet); + } + options[i] = String.format(format, value); } else { - double mileValue = value / UnitConversions.MI_TO_FEET; - mileValue = (int) (mileValue * 10) / 10.0; - options[i] = mileValue + " " + getString(R.string.mile); + double mile = value / UnitConversions.MI_TO_FEET; + if (values[i].equals("5000")) { + format = getString(R.string.value_float_mile_poor_gps); + } else { + format = getString(R.string.value_float_mile); + } + options[i] = String.format(format, mile); } } - if (values[i].equals("200")) { - options[i] += " (" + getString(R.string.settings_recommended) + ")"; - } else if (values[i].equals("10")) { - options[i] += " (" + getString(R.string.min_required_accuracy_excellent_gps) + ")"; - } else if (values[i].equals("5000")) { - options[i] += " (" + getString(R.string.min_required_accuracy_poor_gps) + ")"; - } } - ListPreference list = (ListPreference) findPreference(getString(listId)); list.setEntries(options); } diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java index 674122f2c..c54107c0d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsUtilities.java @@ -20,13 +20,13 @@ import com.google.android.apps.mytracks.util.StringUtils; import com.google.android.apps.mytracks.util.UnitConversions; import com.google.android.maps.mytracks.R; -import java.text.DecimalFormat; -import java.text.NumberFormat; - import android.app.Activity; import android.util.Log; import android.widget.TextView; +import java.text.DecimalFormat; +import java.text.NumberFormat; + /** * Various utility functions for views that display statistics information. * @@ -128,24 +128,24 @@ public class StatsUtilities { public void setAltitudeUnits(int unitLabelId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); - unitTextView.setText(metricUnits ? R.string.meter : R.string.feet); + unitTextView.setText(metricUnits ? R.string.unit_meter : R.string.unit_feet); } public void setDistanceUnits(int unitLabelId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); - unitTextView.setText(metricUnits ? R.string.kilometer : R.string.mile); + unitTextView.setText(metricUnits ? R.string.unit_kilometer : R.string.unit_mile); } public void setSpeedUnits(int unitLabelId, int unitLabelBottomId) { TextView unitTextView = (TextView) activity.findViewById(unitLabelId); unitTextView.setText(reportSpeed - ? (metricUnits ? R.string.kilometer : R.string.mile) - : R.string.min); + ? (metricUnits ? R.string.unit_kilometer : R.string.unit_mile) + : R.string.unit_minute); unitTextView = (TextView) activity.findViewById(unitLabelBottomId); unitTextView.setText(reportSpeed - ? R.string.hr - : (metricUnits ? R.string.kilometer : R.string.mile)); + ? R.string.unit_hour + : (metricUnits ? R.string.unit_kilometer : R.string.unit_mile)); } public void setTime(int id, long l) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java index cf0defa44..84f6bc565 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/TrackList.java +++ b/MyTracks/src/com/google/android/apps/mytracks/TrackList.java @@ -312,17 +312,17 @@ public class TrackList extends ListActivity if (metricUnits) { if (length > 1000) { length /= 1000; - lengthUnit = getString(R.string.kilometer); + lengthUnit = getString(R.string.unit_kilometer); } else { - lengthUnit = getString(R.string.meter); + lengthUnit = getString(R.string.unit_meter); } } else { if (length > UnitConversions.MI_TO_M) { length /= UnitConversions.MI_TO_M; - lengthUnit = getString(R.string.mile); + lengthUnit = getString(R.string.unit_mile); } else { length *= UnitConversions.M_TO_FT; - lengthUnit = getString(R.string.feet); + lengthUnit = getString(R.string.unit_feet); } } textView.setText(String.format("%s %.2f %s", diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java index f423e85c8..f642f2be8 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/docs/DocsHelper.java @@ -280,11 +280,11 @@ public class DocsHelper { TripStatistics stats = track.getStatistics(); String distanceUnit = context.getString(metricUnits ? - R.string.kilometer : R.string.mile); + R.string.unit_kilometer : R.string.unit_mile); String speedUnit = context.getString(metricUnits ? R.string.kilometer_per_hour : R.string.mile_per_hour); String elevationUnit = context.getString(metricUnits ? - R.string.meter : R.string.feet); + R.string.unit_meter : R.string.unit_feet); // Prepare the Post-Text we are going to send. DocsTagBuilder tagBuilder = new DocsTagBuilder(metricUnits) diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java index e28445469..308905fdc 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java +++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java @@ -307,8 +307,8 @@ public class StringUtils implements DescriptionGenerator { // Line 2 context.getString(R.string.total_distance_label), - distanceInKm, context.getString(R.string.kilometer), - distanceInMiles, context.getString(R.string.mile), + distanceInKm, context.getString(R.string.unit_kilometer), + distanceInMiles, context.getString(R.string.unit_mile), // Line 3 context.getString(R.string.total_time_label), @@ -323,18 +323,18 @@ public class StringUtils implements DescriptionGenerator { // Line 6 context.getString(R.string.min_elevation_label), - minElevationInMeters, context.getString(R.string.meter), - minElevationInFeet, context.getString(R.string.feet), + minElevationInMeters, context.getString(R.string.unit_meter), + minElevationInFeet, context.getString(R.string.unit_feet), // Line 7 context.getString(R.string.max_elevation_label), - maxElevationInMeters, context.getString(R.string.meter), - maxElevationInFeet, context.getString(R.string.feet), + maxElevationInMeters, context.getString(R.string.unit_meter), + maxElevationInFeet, context.getString(R.string.unit_feet), // Line 8 context.getString(R.string.elevation_gain_label), - elevationGainInMeters, context.getString(R.string.meter), - elevationGainInFeet, context.getString(R.string.feet), + elevationGainInMeters, context.getString(R.string.unit_meter), + elevationGainInFeet, context.getString(R.string.unit_feet), // Line 9 context.getString(R.string.max_grade_label), maxGrade, @@ -435,8 +435,8 @@ public class StringUtils implements DescriptionGenerator { + "%s: %d %s\n" + "%s: %d %s\n", context.getString(R.string.total_distance_label), - distanceInKm, context.getString(R.string.kilometer), - distanceInMiles, context.getString(R.string.mile), + distanceInKm, context.getString(R.string.unit_kilometer), + distanceInMiles, context.getString(R.string.unit_mile), context.getString(R.string.total_time_label), StringUtils.formatTime(stats.getTotalTime()), context.getString(R.string.moving_time_label), @@ -451,14 +451,14 @@ public class StringUtils implements DescriptionGenerator { maxSpeedInKmh, context.getString(R.string.kilometer_per_hour), maxSpeedInMph, context.getString(R.string.mile_per_hour), context.getString(R.string.min_elevation_label), - minElevationInMeters, context.getString(R.string.meter), - minElevationInFeet, context.getString(R.string.feet), + minElevationInMeters, context.getString(R.string.unit_meter), + minElevationInFeet, context.getString(R.string.unit_feet), context.getString(R.string.max_elevation_label), - maxElevationInMeters, context.getString(R.string.meter), - maxElevationInFeet, context.getString(R.string.feet), + maxElevationInMeters, context.getString(R.string.unit_meter), + maxElevationInFeet, context.getString(R.string.unit_feet), context.getString(R.string.elevation_gain_label), - elevationGainInMeters, context.getString(R.string.meter), - elevationGainInFeet, context.getString(R.string.feet), + elevationGainInMeters, context.getString(R.string.unit_meter), + elevationGainInFeet, context.getString(R.string.unit_feet), context.getString(R.string.max_grade_label), theMaxGrade, percent, context.getString(R.string.min_grade_label), diff --git a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java index ff7959365..bac7cacbd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -252,7 +252,7 @@ public class TrackWidgetProvider String metricUnitsKey = context.getString(R.string.metric_units_key); if (key == null || key.equals(metricUnitsKey)) { isMetric = prefs.getBoolean(metricUnitsKey, true); - distanceLabel = context.getString(isMetric ? R.string.kilometer : R.string.mile); + distanceLabel = context.getString(isMetric ? R.string.unit_kilometer : R.string.unit_mile); speedLabel = context.getString(isMetric ? R.string.kilometer_per_hour : R.string.mile_per_hour); paceLabel = context.getString(isMetric ? R.string.min_per_kilometer : R.string.min_per_mile); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java index 996f77ef5..b0052a655 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/docs/DocsHelper_AddTrackRowTest.java @@ -124,18 +124,18 @@ public class DocsHelper_AddTrackRowTest extends TestCase { final Resources mockResources = AndroidMock.createMock(MockResources.class); if (useMetric) { - AndroidMock.expect(mockResources.getString(R.string.kilometer)) + AndroidMock.expect(mockResources.getString(R.string.unit_kilometer)) .andReturn("km"); AndroidMock.expect(mockResources.getString(R.string.kilometer_per_hour)) .andReturn("kph"); - AndroidMock.expect(mockResources.getString(R.string.meter)) + AndroidMock.expect(mockResources.getString(R.string.unit_meter)) .andReturn("meter"); } else { - AndroidMock.expect(mockResources.getString(R.string.mile)) + AndroidMock.expect(mockResources.getString(R.string.unit_mile)) .andReturn("mile"); AndroidMock.expect(mockResources.getString(R.string.mile_per_hour)) .andReturn("mph"); - AndroidMock.expect(mockResources.getString(R.string.feet)) + AndroidMock.expect(mockResources.getString(R.string.unit_feet)) .andReturn("feet"); } AndroidMock.replay(mockResources);