diff --git a/MyTracks/res/layout/stats_core.xml b/MyTracks/res/layout/stats_core.xml index 64dd9bfab..e7d3301e1 100644 --- a/MyTracks/res/layout/stats_core.xml +++ b/MyTracks/res/layout/stats_core.xml @@ -18,12 +18,12 @@ limitations under the License. diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index a9a3470a9..4c8cd3a61 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -2226,8 +2226,8 @@ limitations under the License. Character limit: ~23 (1 line)"> Speed - + Distance list = new ArrayList(); - addItem(list, R.string.stats_total_distance); + addItem(list, R.string.stats_distance); addItem(list, R.string.stats_total_time); addItem(list, reportSpeed ? R.string.stats_average_speed : R.string.stats_average_pace); addItem(list, R.string.stats_moving_time); 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 21e84da6e..a823d2327 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java +++ b/MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetProvider.java @@ -220,7 +220,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { boolean reportSpeed) { switch (value) { case 0: - updateTotalDistance(context, remoteViews, ids, tripStatistics, metricUnits); + updateDistance(context, remoteViews, ids, tripStatistics, metricUnits); break; case 1: updateTotalTime(context, remoteViews, ids, tripStatistics, isRecording, isPaused); @@ -236,7 +236,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { context, remoteViews, ids, tripStatistics, metricUnits, reportSpeed); break; default: - updateTotalDistance(context, remoteViews, ids, tripStatistics, metricUnits); + updateDistance(context, remoteViews, ids, tripStatistics, metricUnits); break; } @@ -271,7 +271,7 @@ public class TrackWidgetProvider extends AppWidgetProvider { } /** - * Updates total distance. + * Updates distance. * * @param context the context * @param remoteViews the remote views @@ -279,11 +279,11 @@ public class TrackWidgetProvider extends AppWidgetProvider { * @param tripStatistics the trip statistics * @param metricUnits true to use metric units */ - private static void updateTotalDistance(Context context, RemoteViews remoteViews, int[] ids, + private static void updateDistance(Context context, RemoteViews remoteViews, int[] ids, TripStatistics tripStatistics, boolean metricUnits) { double totalDistance = tripStatistics == null ? Double.NaN : tripStatistics.getTotalDistance(); String[] totalDistanceParts = StringUtils.getDistanceParts(context, totalDistance, metricUnits); - remoteViews.setTextViewText(ids[0], context.getString(R.string.stats_total_distance)); + remoteViews.setTextViewText(ids[0], context.getString(R.string.stats_distance)); remoteViews.setTextViewText(ids[1], totalDistanceParts[0]); remoteViews.setTextViewText(ids[2], totalDistanceParts[1]); } diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java index 32d365496..eb0ac9188 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java @@ -63,7 +63,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2