Rename and reorganize variables in strings.xml

- My Maps List
- Send to Google

MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java

@@ -78,7 +78,7 @@ public class AccountChooser {
     // Let the user choose.
     Log.e(Constants.TAG, "Multiple matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.choose_account_title);
+    builder.setTitle(R.string.send_google_choose_account);
     builder.setCancelable(false);
     builder.setPositiveButton(R.string.ok,
         new DialogInterface.OnClickListener() {
@@ -124,8 +124,8 @@ public class AccountChooser {
       final AccountHandler handler) {
     Log.e(Constants.TAG, "No matching accounts found.");
     final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.no_account_found_title);
-    builder.setMessage(R.string.no_account_found);
+    builder.setTitle(R.string.send_google_no_account);
+    builder.setMessage(R.string.send_google_no_account_message);
     builder.setCancelable(true);
     builder.setPositiveButton(R.string.ok,
         new DialogInterface.OnClickListener() {

MyTracks/src/com/google/android/apps/mytracks/MyMapsListAdapter.java

@@ -99,10 +99,10 @@ public class MyMapsListAdapter implements ListAdapter {
       (TextView) convertView.findViewById(R.id.maplistpublic);
     if (publicList.get(position)) {
       publicUnlisted.setTextColor(Color.RED);
-      publicUnlisted.setText(R.string.public_map);
+      publicUnlisted.setText(R.string.my_maps_list_public_label);
     } else {
       publicUnlisted.setTextColor(Color.GREEN);
-      publicUnlisted.setText(R.string.unlisted_map);
+      publicUnlisted.setText(R.string.my_maps_list_unlisted_label);
     }
 
     return convertView;

MyTracks/src/com/google/android/apps/mytracks/io/SendToDocs.java

@@ -92,7 +92,7 @@ public class SendToDocs {
 
   private void doUpload(long trackId) {
     // TODO
-    statusMessage = activity.getString(R.string.error_sending_to_fusion_tables);
+    statusMessage = activity.getString(R.string.send_google_error_docs);
     success = false;
 
     try {
@@ -117,13 +117,13 @@ public class SendToDocs {
       if (success) {
         if (createdNewSpreadSheet) {
           statusMessage = activity.getString(
-              R.string.sending_to_docs_success_new_doc);
+              R.string.send_google_success_new_doc);
         } else {
           statusMessage = activity.getString(
-              R.string.sending_to_docs_success_existing_doc);
+              R.string.send_google_success_existing_doc);
         }
       } else {
-        statusMessage = activity.getString(R.string.error_sending_to_docs);
+        statusMessage = activity.getString(R.string.send_google_error_docs);
       }
       Log.d(Constants.TAG, "SendToDocs: Done.");
     } finally {

MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java

@@ -168,11 +168,11 @@ public class SendToFusionTables implements Runnable {
   }
 
   private void doUpload() {
-    int statusMessageId = R.string.error_sending_to_fusion_tables;
+    int statusMessageId = R.string.send_google_error_fusion_tables;
     boolean success = true;
     try {
       progressIndicator.setProgressValue(PROGRESS_INITIALIZATION);
-      progressIndicator.setProgressMessage(R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -185,13 +185,13 @@ public class SendToFusionTables implements Runnable {
 
       // Create a new table:
       progressIndicator.setProgressValue(PROGRESS_FUSION_TABLE_CREATE);
-      progressIndicator.setProgressMessage(R.string.progress_message_creating_fusion_table);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_creating_fusion_table);
       if (!createNewTable(track) || !makeTableUnlisted()) {
         return;
       }
 
       progressIndicator.setProgressValue(PROGRESS_UPLOAD_DATA_MIN);
-      progressIndicator.setProgressMessage(R.string.progress_message_sending_fusion_tables);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_sending_fusion_tables);
 
       // Upload all of the segments of the track plus start/end markers
       if (!uploadAllTrackPoints(track, originalDescription)) {
@@ -205,7 +205,7 @@ public class SendToFusionTables implements Runnable {
         return;
       }
 
-      statusMessageId = R.string.sending_to_fusion_tables_success;
+      statusMessageId = R.string.send_google_success_fusion_tables;
       Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
     } finally {
@@ -462,7 +462,7 @@ public class SendToFusionTables implements Runnable {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(Constants.TAG,

MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java

@@ -98,11 +98,10 @@ public class SendToMyMaps implements Runnable {
   }
 
   private void doUpload() {
-    int statusMessageId = R.string.error_sending_to_my_maps;
+    int statusMessageId = R.string.send_google_error_my_maps;
     boolean success = true;
     try {
-      progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
@@ -128,8 +127,7 @@ public class SendToMyMaps implements Runnable {
               context.getString(R.string.default_map_public_key), true);
         }
 
-        progressIndicator.setProgressMessage(
-            R.string.progress_message_creating_map);
+        progressIndicator.setProgressMessage(R.string.send_google_progress_creating_map);
 
         StringBuilder mapIdBuilder = new StringBuilder();
         success = mapsClient.createNewMap(
@@ -174,8 +172,8 @@ public class SendToMyMaps implements Runnable {
 
       if (success) {
         statusMessageId = isNewMap
-            ? R.string.sending_to_my_maps_success_new_map
-            : R.string.sending_to_my_maps_success_existing_map;
+            ? R.string.send_google_success_new_map
+            : R.string.send_google_success_existing_map;
       }
       Log.d(TAG, "SendToMyMaps: Done: " + success);
       progressIndicator.setProgressValue(100);
@@ -236,8 +234,7 @@ public class SendToMyMaps implements Runnable {
           new DoubleBuffer(Constants.ELEVATION_SMOOTHING_FACTOR);
 
       List<Location> locations = new ArrayList<Location>(MAX_POINTS_PER_UPLOAD);
-      progressIndicator.setProgressMessage(
-          R.string.progress_message_reading_track);
+      progressIndicator.setProgressMessage(R.string.send_google_progress_reading_track);
       Location lastLocation = null;
       do {
         if (totalLocationsRead % 100 == 0) {
@@ -310,8 +307,7 @@ public class SendToMyMaps implements Runnable {
 
 
   private boolean prepareAndUploadPoints(Track track, List<Location> locations) {
-    progressIndicator.setProgressMessage(
-        R.string.progress_message_preparing_track);
+    progressIndicator.setProgressMessage(R.string.send_google_progress_preparing_track);
     updateProgress();
 
     int numLocations = locations.size();
@@ -325,13 +321,12 @@ public class SendToMyMaps implements Runnable {
     ArrayList<Track> splitTracks = prepareLocations(track, locations);
 
     // Start uploading them
-    progressIndicator.setProgressMessage(
-        R.string.progress_message_sending_my_maps);
+    progressIndicator.setProgressMessage(R.string.send_google_progress_sending_my_maps);
     for (Track splitTrack : splitTracks) {
       if (totalSegmentsUploaded > 1) {
         splitTrack.setName(splitTrack.getName() + " "
             + String.format(
-                context.getString(R.string.send_google_track_part_format), totalSegmentsUploaded));
+                context.getString(R.string.send_google_track_part_label), totalSegmentsUploaded));
       }
       totalSegmentsUploaded++;
       Log.d(TAG,

MyTracks/src/com/google/android/apps/mytracks/io/backup/BackupActivityHelper.java

@@ -85,7 +85,7 @@ public class BackupActivityHelper {
 
     final ProgressDialog progressDialog = ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
+        activity.getString(R.string.generic_progress_title),
         activity.getString(R.string.settings_backup_now_progress_message),
         true);
 
@@ -186,7 +186,7 @@ public class BackupActivityHelper {
     // Show a progress dialog
     ProgressDialog.show(
         activity,
-        activity.getString(R.string.progress_title),
+        activity.getString(R.string.generic_progress_title),
         activity.getString(R.string.settings_backup_restore_progress_message),
         true);
 

MyTracks/src/com/google/android/apps/mytracks/io/file/WriteProgressController.java

@@ -79,7 +79,7 @@ class WriteProgressController {
   public ProgressDialog createProgressDialog() {
     dialog = new ProgressDialog(activity);
     dialog.setIcon(android.R.drawable.ic_dialog_info);
-    dialog.setTitle(activity.getString(R.string.progress_title));
+    dialog.setTitle(activity.getString(R.string.generic_progress_title));
     dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     dialog.setMessage(activity.getString(R.string.progress_message_export));
     dialog.setIndeterminate(true);

MyTracks/src/com/google/android/apps/mytracks/io/mymaps/MapsFacade.java

@@ -119,7 +119,7 @@ public class MapsFacade {
         MyMapsMapMetadata metaData = new MyMapsMapMetadata();
         metaData.setTitle(title);
         metaData.setDescription(description + " - "
-            + category + " - " + context.getString(R.string.send_to_google_by_mytracks));
+            + category + " - " + context.getString(R.string.send_google_by_my_tracks));
         metaData.setSearchable(isPublic);
         Entry entry = MyMapsGDataConverter.getMapEntryForMetadata(metaData);
         Log.d(MyMapsConstants.TAG, "Title: " + entry.getTitle());

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendActivity.java

@@ -392,7 +392,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     progressDialog = new ProgressDialog(this);
     progressDialog.setCancelable(false);
     progressDialog.setIcon(android.R.drawable.ic_dialog_info);
-    progressDialog.setTitle(R.string.progress_title);
+    progressDialog.setTitle(R.string.generic_progress_title);
     progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
     progressDialog.setMax(100);
     progressDialog.setProgress(0);
@@ -403,8 +403,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
   private SendState authenticateToGoogleMaps() {
     Log.d(TAG, "SendActivity.authenticateToGoogleMaps");
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_my_maps));
+    progressDialog.setMessage(getString(R.string.send_google_progress_auth_my_maps));
     authenticate(Constants.AUTHENTICATE_TO_MY_MAPS, MyMapsConstants.SERVICE_NAME);
     // AUTHENTICATE_TO_MY_MAPS callback calls sendToGoogleMaps
     return SendState.NOT_READY;
@@ -479,8 +478,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToFusionTables() {
     progressDialog.setProgress(0);
-    progressDialog.setMessage(getString(
-        R.string.progress_message_authenticating_fusion_tables));
+    progressDialog.setMessage(getString(R.string.send_google_progress_auth_fusion_tables));
     authenticate(Constants.AUTHENTICATE_TO_FUSION_TABLES, SendToFusionTables.SERVICE_ID);
     // AUTHENTICATE_TO_FUSION_TABLES callback calls sendToFusionTables
     return SendState.NOT_READY;
@@ -536,8 +534,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleDocs() {
     setProgressValue(0);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(R.string.send_google_progress_auth_docs);
     authenticate(Constants.AUTHENTICATE_TO_DOCLIST, SendToDocs.GDATA_SERVICE_NAME_DOCLIST);
     // AUTHENTICATE_TO_DOCLIST callback calls authenticateToGoogleTrix
     return SendState.NOT_READY;
@@ -545,8 +542,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
 
   private SendState authenticateToGoogleTrix() {
     setProgressValue(30);
-    setProgressMessage(
-        R.string.progress_message_authenticating_docs);
+    setProgressMessage(R.string.send_google_progress_auth_docs);
     authenticate(Constants.AUTHENTICATE_TO_TRIX, SendToDocs.GDATA_SERVICE_NAME_TRIX);
     // AUTHENTICATE_TO_TRIX callback calls sendToGoogleDocs
     return SendState.NOT_READY;
@@ -557,7 +553,7 @@ public class SendActivity extends Activity implements ProgressIndicator {
     tracker.trackPageView("/send/docs");
 
     setProgressValue(50);
-    setProgressMessage(R.string.progress_message_sending_docs);
+    setProgressMessage(R.string.send_google_progress_sending_docs);
     final SendToDocs sender = new SendToDocs(this,
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_TRIX),
         authMap.get(SendToDocs.GDATA_SERVICE_NAME_DOCLIST),

MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/SendType.java

@@ -23,11 +23,11 @@ import com.google.android.maps.mytracks.R;
  * @author Matthew Simmons
  */
 public enum SendType {
-  MYMAPS(R.string.sendtogoogle_google_mymaps,
+  MYMAPS(R.string.send_google_my_maps,
       R.string.sendtogoogle_google_mymaps_url),
-  FUSION_TABLES(R.string.sendtogoogle_google_fusiontables,
+  FUSION_TABLES(R.string.send_google_fusion_tables,
       R.string.sendtogoogle_google_fusiontables_url),
-  DOCS(R.string.sendtogoogle_google_docs,
+  DOCS(R.string.send_google_docs,
       R.string.sendtogoogle_google_docs_url);
 
   private int serviceName;

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

@@ -303,7 +303,7 @@ public class StringUtils implements DescriptionGenerator {
         + "<img border=\"0\" src=\"%s\"/>",
 
         // Line 1
-        context.getString(R.string.send_to_google_by_mytracks),
+        context.getString(R.string.send_google_by_my_tracks),
 
         // Line 2
         context.getString(R.string.stat_total_distance),
@@ -343,11 +343,11 @@ public class StringUtils implements DescriptionGenerator {
         context.getString(R.string.stat_min_grade), minGrade,
 
         // Line 11
-        context.getString(R.string.recorded_date),
+        context.getString(R.string.send_google_recorded),
         new Date(trackStats.getStartTime()),
 
         // Line 12
-        context.getString(R.string.category), category,
+        context.getString(R.string.track_detail_activity_type_hint), category,
 
         // Line 13
         ChartURLGenerator.getChartUrl(distances, elevations, track, context));