Code cleanup. Rename stats_total_distance to stats_distance.

MyTracks/res/layout/stats_core.xml

@@ -18,12 +18,12 @@ limitations under the License.
   <!-- Total distance -->
   <TableRow>
     <TextView
-      android:text="@string/stats_total_distance"
+      android:text="@string/stats_distance"
       style="@style/StatsLabel" />
   </TableRow>
   <TableRow>
     <TextView
-      android:id="@+id/stats_total_distance_value"
+      android:id="@+id/stats_distance_value"
       style="@style/StatsValue" />
   </TableRow>
   <!-- Total time/moving time -->

MyTracks/res/values/strings.xml

@@ -2226,8 +2226,8 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Speed
   </string>
-  <string name="stats_total_distance"
+  <string name="stats_distance"
-    translation_description="In the 'Stats' page, the total distance.">
+    translation_description="In the 'Stats' page, the distance.">
     Distance
   </string>
   <string name="stats_total_time"

MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java

@@ -109,7 +109,7 @@ public class StatsUtils {
     
     // Set total distance
     double totalDistance = tripStatistics == null ? Double.NaN : tripStatistics.getTotalDistance();
-    setDistanceValue(activity, R.id.stats_total_distance_value, totalDistance, metricUnits);
+    setDistanceValue(activity, R.id.stats_distance_value, totalDistance, metricUnits);
     
     // Set total time
     setTimeValue(activity, R.id.stats_total_time_value,

MyTracks/src/com/google/android/apps/mytracks/widgets/TrackWidgetConfigActivity.java

@@ -63,7 +63,7 @@ public class TrackWidgetConfigActivity extends Activity {
         this, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
 
     List<CharSequence> list = new ArrayList<CharSequence>();
-    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);

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]);
   }

MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/MenuItemsTest.java

@@ -63,7 +63,7 @@ public class MenuItemsTest extends ActivityInstrumentationTestCase2<TrackListAct
     // Menu in TrackListActivity.
     EndToEndTestUtils.findMenuItem(activityMyTracks.getString(R.string.menu_aggregated_statistics),
         true);
-    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.stats_total_distance));
+    EndToEndTestUtils.SOLO.waitForText(activityMyTracks.getString(R.string.stats_distance));
     EndToEndTestUtils.SOLO.goBack();
     instrumentation.waitForIdleSync();
     EndToEndTestUtils.createTrackIfEmpty(1, false);