diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml new file mode 100644 index 000000000..d982f7dd0 --- /dev/null +++ b/MyTracks/res/values/keys.xml @@ -0,0 +1,42 @@ + + + + + announcementFrequency + bluetoothDevice + bluetoothPairing + bluetoothSensor + defaultMapPublic + maxRecordingDistance + metricUnits + minRecordingDistance + minRecordingInterval + minRequiredAccuracy + modularStatsDisplay + pickExistingMap + recordingTrack + reportSpeed + selectedTrack + sendStatsAndPoints + sendToDocs + sendToMyMaps + sensorId + sensorType + shareUrlOnly + signalSamplingFrequency + splitFrequency + \ No newline at end of file diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml index 6f7b14e4c..c8c68c17c 100644 --- a/MyTracks/res/values/strings.xml +++ b/MyTracks/res/values/strings.xml @@ -167,10 +167,6 @@ limitations under the License. Recording Sharing - Black box mode - Recording will be started and stopped automatically - Recording must be initiated by the user - Announcement frequency Minimum time between two voice announcements Text-to-speech announcements are not available in your version of Android @@ -354,7 +350,6 @@ limitations under the License. Max Heart Rate - Waiting... - Mode End User License Agreement @@ -436,31 +431,6 @@ limitations under the License. CDMA Strength: %1$d dBm EVDO Strength: %1$d dBm - - announcementFrequency - bluetoothDevice - bluetoothPairing - bluetoothSensor - defaultMapPublic - maxRecordingDistance - metricUnits - minRecordingDistance - minRecordingInterval - minRequiredAccuracy - modularStatsDisplay - pickExistingMap - recordingTrack - reportSpeed - selectedTrack - sendStatsAndPoints - sendToDocs - sendToMyMaps - sensorId - sensorType - shareUrlOnly - signalSamplingFrequency - splitFrequency - Bluetooth Bluetooth options @@ -484,16 +454,5 @@ limitations under the License. Sensor Data Time Power meter enabled Heart rate monitor enabled - Last Upload Latency - Last N Uploads Latency - - - Realtime upload failed. - Realtime upload status - Failed to load encryption keys. - Uploader ID - Your ID to upload data with - Upload URL - URL to upload realtime data to diff --git a/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java b/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java index 40f3f60ee..cfc1f8a3d 100644 --- a/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java +++ b/MyTracks/src/com/google/android/apps/mymaps/VersionChecker.java @@ -87,10 +87,12 @@ public class VersionChecker { try { PackageInfo pi = parentActivity.getPackageManager().getPackageInfo( - "com.google.android.maps.mytracks", PackageManager.GET_META_DATA); + "com.google.android.maps.mytracks", + PackageManager.GET_META_DATA); currentVersion = pi.versionName; } catch (NameNotFoundException e) { Log.w(MyTracksConstants.TAG, "Failed to get version info.", e); + return; } GDataParser parser = client.getParserForFeed( diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java index 853b93429..cb582f089 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java +++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java @@ -109,7 +109,8 @@ public class ExportAllTracks { context.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0); long recordingTrackId = -1; if (prefs != null) { - recordingTrackId = prefs.getLong(context.getString(R.string.recording_track_key), -1); + recordingTrackId = + prefs.getLong(context.getString(R.string.recording_track_key), -1); } if (recordingTrackId != -1) { acquireWakeLock(); diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java index 6cba84bae..e09011b86 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java @@ -26,7 +26,7 @@ import android.view.MenuItem; * * @author Sandor Dornbush */ -public class MenuManager { +class MenuManager { private MyTracks activity; diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java index e9f980af4..be01ace79 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksConstants.java @@ -64,7 +64,6 @@ public abstract class MyTracksConstants { public static final int SHOW_WAYPOINT = 25; public static final int EDIT_WAYPOINT = 26; public static final int WELCOME = 27; - public static final int REQUEST_ENABLE_BT = 28; /* * Menu ids: diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java index 012883fe7..700db0687 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java @@ -215,30 +215,26 @@ public class MyTracksMap extends MapActivity while (lastSeenLocationId < selectedTrack.getStopId()) { cursor = providerUtils.getLocationsCursor( selectedTrack.getId(), lastSeenLocationId, bufferSize, false); - if (cursor != null) { - if (cursor.moveToFirst()) { - final int idColumnIdx = - cursor.getColumnIndexOrThrow(TrackPointsColumns._ID); - while (cursor.moveToNext()) { - points++; - Location location = providerUtils.createLocation(cursor); - if (MyTracksUtils.isValidLocation(location)) { - lastSeenLocationId = cursor.getLong(idColumnIdx); - // Include a point if it fits one of the following criteria: - // - Has the mod for the sampling frequency. - // - Is the first point. - // - Is the last point and we are not recording this track. - if (points % samplingFrequency == 0 || - points == 0 || - (recordingTrackId != selectedTrack.getId() && - points == (totalLocations - 1))) { - mapOverlay.addLocation(location); - } - } - } - } else { - lastSeenLocationId += bufferSize; - } + if (cursor != null && cursor.moveToFirst()) { + final int idColumnIdx = + cursor.getColumnIndexOrThrow(TrackPointsColumns._ID); + while (cursor.moveToNext()) { + points++; + Location location = providerUtils.createLocation(cursor); + if (MyTracksUtils.isValidLocation(location)) { + lastSeenLocationId = cursor.getLong(idColumnIdx); + // Include a point if it fits one of the following criteria: + // - Has the mod for the sampling frequency. + // - Is the first point. + // - Is the last point and we are not recording this track. + if (points % samplingFrequency == 0 || + points == 0 || + (recordingTrackId != selectedTrack.getId() && + points == (totalLocations - 1))) { + mapOverlay.addLocation(location); + } + } + } } else { lastSeenLocationId += bufferSize; } diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java index 2386a73c3..5c1cf8c34 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java +++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksOverlay.java @@ -55,7 +55,7 @@ public class MyTracksOverlay extends Overlay { private final Paint errorCirclePaint; private final Context context; private final ArrayList waypoints = new ArrayList(); - private final ArrayList points = new ArrayList(); + private final ArrayList points = new ArrayList(1024); private Track selectedTrack; private int lastHeading = 0; diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java index 36fdd96ba..dc69aaa40 100644 --- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java +++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java @@ -94,6 +94,9 @@ public class StatsActivity extends Activity */ private boolean showCurrentSegment = false; + private final MyTracksProviderUtils providerUtils; + private Track track = null; + /** * A runnable for posting to the UI thread. Will update the total time field. */ @@ -131,9 +134,6 @@ public class StatsActivity extends Activity } } - private MyTracksProviderUtils providerUtils; - private Track track = null; - public StatsActivity() { utils = new StatsUtilities(this); providerUtils = new MyTracksProviderUtilsImpl(this);