diff --git a/MyTracks/res/layout/help.xml b/MyTracks/res/layout/help.xml index b2043cdeb..930e7bbbc 100644 --- a/MyTracks/res/layout/help.xml +++ b/MyTracks/res/layout/help.xml @@ -103,10 +103,10 @@ limitations under the License. android:text="@string/help_saved_files_answer" style="@style/HelpAnswer" /> + + + The operation was canceled. + + + No external storage is found. + + + Unable to import from external storage. + + + No file found in %1$s. + + + Importing from external storage… + + + Finished importing from external storage. + + + Imported %1$d of %2$s from %3$s. + + + Unable to save to external storage. + + + Unable to create a directory on the external storage. + + + No track is saved to the external storage. + + + Saving to external storage… + + + Finished saving to external storage. + + @@ -712,8 +776,8 @@ limitations under the License. translation_description="In the 'Help' page, the answer on battery life."> The GPS receiver draws a relatively high amount of power, so a fully charged battery typically survives less than 5 hours. Battery life depends on many factors, including signal strength, - battery freshness, and tasks running in parallel. Switching off some or all of the phone\'s - radios will lengthen battery life. Putting the phone into Airplane mode will yield the best + battery freshness, and tasks running in parallel. Switching off some or all of the device\'s + radios will lengthen battery life. Putting the device into Airplane mode will yield the best results. From the track list, select “Delete all” when not recording. This permanently - deletes the recorded tracks from memory. If you have saved tracks or backups on the SD card, you - must delete them separately. You can access the SD card using any file manager app from the Play - Store or using a USB cable to connect your phone to your computer. Tracks uploaded to Google - Maps, Google Fusion Tables, and Google Docs must also be deleted separately. + deletes the recorded tracks from the device memory. If you have saved tracks or backups on the + external storage, you must delete them separately. You can access the external storage using + any file manager app from the Play Store or using a USB cable to connect your device to your + computer. Tracks uploaded to Google Maps, Google Fusion Tables, and Google Docs must also be + deleted separately. - How do I delete all the tracks from the phone? + How do I delete all the tracks from the device? Currently, you can\'t with My Tracks. But you can upload your tracks to Google or save them to - the SD card to modify them there. + the external storage to modify them there. @@ -763,9 +828,18 @@ limitations under the License. translation_description="In the 'Help' page, the question on elevation precision."> How precise is the elevation measurement? + + Tracks saved on the external storage are not encrypted. Any application on the device can access + them. + + + Who can access the tracks saved on the external storage? + - For My Tracks to work, your phone needs to be in line-of-sight contact with the GPS satellites. + For My Tracks to work, your device needs to be in line-of-sight contact with the GPS satellites. If the line-of-sight is obstructed by trees, buildings or canyon walls, you may not get an accurate signal. If you see the message, wait a minute or two. If your device still does not find a signal, move to an area clear of obstructions and try again. @@ -792,7 +866,7 @@ limitations under the License. See %1$s. + translation_description="In the 'Help' page, the question on public versus unlisted maps."> What is the difference between public and unlisted when sending a track to Google Maps? - What can I do with tracks after saving them to the SD card or sharing such files with friends? - - - Tracks saved on the SD card are not encrypted. Any application on the phone can access them. - - - Who can access the tracks saved on the SD card? + What can I do with tracks after saving them to the external storage or sharing such files with + friends? + device that can be used. This is the generic accessibility description for any application + icon."> Application - The marker will be permanently deleted from the phone. + user that the marker will be permanently deleted from the device."> + The marker will be permanently deleted from the device. - Import from SD card + Import from external storage - Save to SD card + Save to external storage - Save all to SD card + Save all to external storage @@ -1180,13 +1245,13 @@ limitations under the License. Split frequency Start GPS Stop GPS @@ -1230,7 +1295,7 @@ limitations under the License. + installation when the app wants to receive Google My Tracks notifications."> Allows the application to receive notifications when Google My Tracks starts or stops a recording. @@ -1241,7 +1306,7 @@ limitations under the License. + installation when the app wants to read Google My Tracks data."> Allows the application to read Google My Tracks data. + installation when the app wants to write data to My Tracks."> Allows the application to write data to Google My Tracks and start/stop Google My Tracks recording. @@ -1261,70 +1326,6 @@ limitations under the License. write data to Google My Tracks and start/stop Google My Tracks recording - - - The operation was canceled. - - - No SD card is found. - - - Unable to import from SD card. - - - No file found in %1$s. - - - Importing from SD card… - - - Finished importing from SD card. - - - Imported %1$d of %2$s from %3$s. - - - Unable to save to SD card. - - - Unable to create a directory on SD card. - - - You have no track to save to SD card. - - - Saving to SD card… - - - Finished saving to SD card. - - Backup now + progress message telling the user that it is writing all tracks and settings to the external + storage."> Writing all tracks and settings… - Write a full copy of all your tracks and settings to the SD card. + translation_description="In the 'Backup' settings, the summary for the 'Backup now' option + explaining that all tracks and settings will be written to the external storage."> + Write a full copy of all your tracks and settings to the external storage. Restore now @@ -1565,7 +1566,8 @@ limitations under the License. translation_description="In the 'Backup' settings, after pressing the 'Restore now' option, the message in the alert dialog asking the user to confirm that he wants to restore from a backup and it will overwrite all the current tracks and settings."> - Restoring a backup from the SD card will overwrite all your current tracks and settings. + Restoring a backup from the external storage will overwrite all your current tracks and + settings. + on the external storage."> Reading all tracks and settings… - Restore all tracks and settings from the SD card. + translation_description="In the 'Backup' settings, the summary for the 'Restore now' option + explaining that it restores all tracks and settings from the external storage."> + Restore all tracks and settings from the external storage. @@ -1690,7 +1691,7 @@ limitations under the License. Auto-resume @@ -1698,8 +1699,8 @@ limitations under the License. - Maximum time after which a previously recording track will not be resumed after phone reboot. + not be resumed after device reboot."> + Maximum time after which a previously recording track will not be resumed after device reboot. Paired with: %1$d - + translation_description="After saving a track to the external storage, the button on the result + dialog to share the saved track file with friends."> Share track file - The track and its markers will be permanently deleted from the phone. + the track and its markers will be permanently deleted from the device."> + The track and its markers will be permanently deleted from the device. - Unalbe to install Google Earth from the Play Store. + Unable to install Google Earth from the Play Store. @@ -2272,8 +2273,8 @@ limitations under the License. - All tracks and markers will be permanently deleted from the phone. + the user that all tracks and markers will be permanently deleted from the device."> + All tracks and markers will be permanently deleted from the device. + android:title="@string/settings_sensor_ant_reset_bike_cadence_sensor" /> { this.externalFileBackup = new ExternalFileBackup(backupActivity); success = false; completed = false; - messageId = R.string.sd_card_save_error; + messageId = R.string.external_storage_save_error; } /** @@ -81,18 +81,18 @@ public class BackupAsyncTask extends AsyncTask { @Override protected Boolean doInBackground(Void... params) { if (!FileUtils.isSdCardAvailable()) { - messageId = R.string.sd_card_error_no_storage; + messageId = R.string.external_storage_error_no_storage; return false; } if (!externalFileBackup.isBackupsDirectoryAvailable(true)) { - messageId = R.string.sd_card_save_error_create_dir; + messageId = R.string.external_storage_save_error_create_dir; return false; } try { externalFileBackup.writeToDefaultFile(); - messageId = R.string.sd_card_save_success; + messageId = R.string.external_storage_save_success; return true; } catch (IOException e) { Log.d(TAG, "IO exception", e); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java index b9e8efbfc..cf4e008dd 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreAsyncTask.java @@ -59,7 +59,7 @@ public class RestoreAsyncTask extends AsyncTask { this.externalFileBackup = new ExternalFileBackup(restoreActivity); success = false; completed = false; - messageId = R.string.sd_card_import_error; + messageId = R.string.external_storage_import_error; } /** @@ -85,7 +85,7 @@ public class RestoreAsyncTask extends AsyncTask { protected Boolean doInBackground(Void... params) { try { externalFileBackup.restoreFromDate(date); - messageId = R.string.sd_card_import_success; + messageId = R.string.external_storage_import_success; return true; } catch (IOException e) { Log.d(TAG, "IO exception", e); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java index df63911bf..0a5955c15 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/backup/RestoreChooserActivity.java @@ -58,7 +58,7 @@ public class RestoreChooserActivity extends Activity { // Get the list of existing backups if (!FileUtils.isSdCardAvailable()) { - Toast.makeText(this, R.string.sd_card_error_no_storage, Toast.LENGTH_LONG).show(); + Toast.makeText(this, R.string.external_storage_error_no_storage, Toast.LENGTH_LONG).show(); finish(); return; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java index 46cf90e12..d2924650d 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java @@ -100,9 +100,10 @@ public class SaveActivity extends Activity { protected Dialog onCreateDialog(int id) { switch (id) { case DIALOG_PROGRESS_ID: - progressDialog = DialogUtils.createHorizontalProgressDialog( - this, R.string.sd_card_save_progress_message, new DialogInterface.OnCancelListener() { - @Override + progressDialog = DialogUtils.createHorizontalProgressDialog(this, + R.string.external_storage_save_progress_message, + new DialogInterface.OnCancelListener() { + @Override public void onCancel(DialogInterface dialog) { saveAsyncTask.cancel(true); finish(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java index 9be2add93..a7869b393 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveAsyncTask.java @@ -91,7 +91,7 @@ public class SaveAsyncTask extends AsyncTask { trackWriter = null; success = false; completed = false; - messageId = R.string.sd_card_save_error; + messageId = R.string.external_storage_save_error; savedPath = null; } @@ -170,12 +170,12 @@ public class SaveAsyncTask extends AsyncTask { try { cursor = myTracksProviderUtils.getTrackCursor(null, null, TracksColumns._ID); if (cursor == null) { - messageId = R.string.sd_card_save_error_no_track; + messageId = R.string.external_storage_save_error_no_track; return false; } int count = cursor.getCount(); if (count == 0) { - messageId = R.string.sd_card_save_error_no_track; + messageId = R.string.external_storage_save_error_no_track; return false; } int idIndex = cursor.getColumnIndexOrThrow(TracksColumns._ID); @@ -190,7 +190,7 @@ public class SaveAsyncTask extends AsyncTask { } publishProgress(i + 1, count); } - messageId = R.string.sd_card_save_success; + messageId = R.string.external_storage_save_success; return true; } finally { if (cursor != null) { diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java index 0c32b3d71..7f5cf1693 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java +++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterImpl.java @@ -53,7 +53,7 @@ class TrackWriterImpl implements TrackWriter { private final Track track; private final TrackFormatWriter writer; private boolean success = false; - private int errorMessage = R.string.sd_card_save_error; + private int errorMessage = R.string.external_storage_save_error; private File directory = null; private File file = null; private OnWriteListener onWriteListener; @@ -105,7 +105,7 @@ class TrackWriterImpl implements TrackWriter { private void doWriteTrack() { // Open the input and output success = false; - errorMessage = R.string.sd_card_save_error; + errorMessage = R.string.external_storage_save_error; if (track != null) { if (openFile()) { try { @@ -118,7 +118,7 @@ class TrackWriterImpl implements TrackWriter { } } success = false; - errorMessage = R.string.sd_card_canceled; + errorMessage = R.string.external_storage_canceled; } } } @@ -186,7 +186,7 @@ class TrackWriterImpl implements TrackWriter { writer.prepare(track, newOutputStream(fileName)); } catch (FileNotFoundException e) { Log.e(Constants.TAG, "Failed to open output file.", e); - errorMessage = R.string.sd_card_save_error; + errorMessage = R.string.external_storage_save_error; return false; } return true; @@ -204,12 +204,12 @@ class TrackWriterImpl implements TrackWriter { if (!FileUtils.isSdCardAvailable()) { Log.i(Constants.TAG, "Could not find SD card."); - errorMessage = R.string.sd_card_error_no_storage; + errorMessage = R.string.external_storage_error_no_storage; return false; } if (!FileUtils.ensureDirectoryExists(directory)) { Log.i(Constants.TAG, "Could not create export directory."); - errorMessage = R.string.sd_card_save_error_create_dir; + errorMessage = R.string.external_storage_save_error_create_dir; return false; } @@ -283,7 +283,7 @@ class TrackWriterImpl implements TrackWriter { writer.close(); success = true; Log.d(Constants.TAG, "Done writing track."); - errorMessage = R.string.sd_card_save_success; + errorMessage = R.string.external_storage_save_success; } private void writeLocations() throws InterruptedException { diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java index cfd26bd1a..3df458d9d 100644 --- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java +++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/DeleteTest.java @@ -76,7 +76,7 @@ public class DeleteTest extends ActivityInstrumentationTestCase2