diff --git a/MyTracks/AndroidManifest.xml b/MyTracks/AndroidManifest.xml
index fc256591d..6c21fd846 100755
--- a/MyTracks/AndroidManifest.xml
+++ b/MyTracks/AndroidManifest.xml
@@ -22,19 +22,16 @@ limitations under the License.
-
-
-
@@ -46,18 +43,14 @@ limitations under the License.
-
-
-
-
-
-
@@ -143,21 +134,16 @@ limitations under the License.
-
+
-
+ android:name="com.google.android.apps.mytracks.ImportActivity" >
-
@@ -172,17 +158,17 @@ limitations under the License.
+ android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
+ android:value="com.google.android.apps.mytracks.SearchListActivity" />
+
+ android:name="com.google.android.apps.mytracks.SearchListActivity" >
@@ -194,39 +180,25 @@ limitations under the License.
-
-
-
-
-
-
+
+
+ android:value="com.google.android.apps.mytracks.SearchListActivity" />
-
-
-
+
+
+
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
@@ -247,7 +227,7 @@ limitations under the License.
android:label="@string/my_tracks_recording_service"
android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
+
@@ -264,7 +244,7 @@ limitations under the License.
android:name="android.appwidget.provider"
android:resource="@xml/track_widget_info" />
-
+
-
-
-
+
+ -
\ No newline at end of file
diff --git a/MyTracks/res/menu/track_detail.xml b/MyTracks/res/menu/track_detail.xml
index 5b48e050b..ccc42927c 100644
--- a/MyTracks/res/menu/track_detail.xml
+++ b/MyTracks/res/menu/track_detail.xml
@@ -18,30 +18,34 @@ limitations under the License.
-
-
\ No newline at end of file
diff --git a/MyTracks/res/menu/track_list.xml b/MyTracks/res/menu/track_list.xml
index 8fd39329b..ef23f34fc 100644
--- a/MyTracks/res/menu/track_list.xml
+++ b/MyTracks/res/menu/track_list.xml
@@ -18,12 +18,12 @@ limitations under the License.
-
+ android:icon="@drawable/menu_save_all"
+ android:id="@+id/track_list_save_all"
+ android:title="@string/menu_save_all">
-
+
+
+
+
+
+
+
+
+
diff --git a/MyTracks/res/values/arrays_do_not_translate.xml b/MyTracks/res/values/arrays_do_not_translate.xml
index 9f4c74502..fb5aeb571 100644
--- a/MyTracks/res/values/arrays_do_not_translate.xml
+++ b/MyTracks/res/values/arrays_do_not_translate.xml
@@ -16,7 +16,6 @@ limitations under the License.
-->
-
- @string/activity_type_airplane
- @string/activity_type_atv
@@ -84,35 +83,28 @@ limitations under the License.
- @string/activity_type_water_skiing
- @string/activity_type_wind_surfing
-
-
- - @string/settings_display_track_color_single
- - @string/settings_display_track_color_fixed
- - @string/settings_display_track_color_dynamic
-
-
-
- - @string/display_track_color_value_none
- - @string/display_track_color_value_fixed
- - @string/display_track_color_value_dynamic
-
-
-
- - GPX
- - KML
- - CSV
- - TCX
-
-
-
+
- 0
- 5
- 10
- 15
- -1
-
-
+
+ - GPX
+ - KML
+ - CSV
+ - TCX
+
+
+ - 50
+ - 100
+ - 200
+ - 500
+ - 1000
+ - 5000
+
+
- 1
- 2
- 3
@@ -121,20 +113,7 @@ limitations under the License.
- 10
- 100
-
-
- - 10
- - 20
- - 50
- - 100
- - 200
- - 500
- - 1000
- - 2000
- - 5000
-
-
-
+
- -2
- -1
- 0
@@ -152,66 +131,77 @@ limitations under the License.
- 900
- 1800
-
-
- - 0
- - -100
- - -50
- - -25
- - -10
- - -5
- - -1
- - 60
- - 30
- - 15
+
- 10
- - 5
- - 2
- - 1
-
-
-
+ - 20
- 50
- 100
- 200
- 500
- 1000
+ - 2000
- 5000
-
-
- - @string/sensor_type_value_ant
- - @string/sensor_type_value_srm_ant_bridge
+
+ - 0
+ - 1
+ - 2
+ - 5
+ - 10
+ - 15
+ - 30
+ - 60
+ - -1
+ - -5
+ - -10
+ - -25
+ - -50
+ - -100
-
-
+
- @string/settings_sensor_type_none
- @string/settings_sensor_type_ant
- @string/settings_sensor_type_srm
- @string/settings_sensor_type_polar
- @string/settings_sensor_type_zephyr
-
-
+
- @string/sensor_type_value_none
- @string/sensor_type_value_ant
- @string/sensor_type_value_srm_ant_bridge
- @string/sensor_type_value_polar
- @string/sensor_type_value_zephyr
-
-
+
+ - @string/settings_sensor_type_none
+ - @string/settings_sensor_type_polar
+ - @string/settings_sensor_type_zephyr
+
+
+ - @string/sensor_type_value_none
+ - @string/sensor_type_value_polar
+ - @string/sensor_type_value_zephyr
+
+
+ - @string/settings_map_track_color_mode_single
+ - @string/settings_map_track_color_mode_fixed
+ - @string/settings_map_track_color_mode_dynamic
+
+
+ - @string/settings_map_track_color_mode_single_value
+ - @string/settings_map_track_color_mode_fixed_value
+ - @string/settings_map_track_color_mode_dynamic_value
+
+
- @string/settings_recording_track_name_date_local_option
- @string/settings_recording_track_name_date_iso_8601_option
- @string/settings_recording_track_name_number_option
-
-
+
- @string/settings_recording_track_name_date_local_value
- @string/settings_recording_track_name_date_iso_8601_value
- @string/settings_recording_track_name_number_value
-
- @string/waypoint_type_atm
- @string/waypoint_type_bank
diff --git a/MyTracks/res/values/colors.xml b/MyTracks/res/values/colors.xml
index 9f396f181..936356e81 100644
--- a/MyTracks/res/values/colors.xml
+++ b/MyTracks/res/values/colors.xml
@@ -17,13 +17,13 @@ limitations under the License.
#FF000000
#FF0000FF
- #FF00FF00
#FFAAAAAA
#FFFF0000
- #FFF0F0F0
- #FF0F0F0F
#FFFFFFFF
+
+ #FFFF8800
+
#FF339933
@@ -46,7 +46,6 @@ limitations under the License.
#40401465
- #EDEDED
#99999999
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index b1dcb20eb..3bad2cdf7 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -16,36 +16,25 @@ limitations under the License.
-->
- 25
- 15
- 9
- DYNAMIC
- FIXED
- NONE
-
- http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png
-
-
- http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
-
- UA-7222692-2
+ http://maps.google.com/mapfiles/ms/micons/ylw-pushpin.png
+ http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
+ UA-7222692-2
www.google.com/policies/privacy/
My Tracks Recording Service
-
- groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks
-
+ groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks
www.google.com/mobile/mytracks
-
- com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS
-
+ com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS
docs.google.com
google.com/fusiontables
maps.google.com
- ANT
+ ANT
NONE
POLAR
SRM_ANT_BRIDGE
ZEPHYR
+ DYNAMIC
+ FIXED
+ SINGLE
DATE_ISO_8601
DATE_LOCAL
NUMBER
@@ -53,4 +42,4 @@ limitations under the License.
android.intent.action.SAVE
com.google.android.apps.mytracks.START_NEW_TRACK
-
-
+
\ No newline at end of file
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index ca42cc92d..2d8f93aa9 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -15,16 +15,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
allowAccess
announcementFrequency
antCadenceSensorId
antCadenceSpeedSensorId
antHeartRateSensorId
- antSRMBridgeSensorId
+ antSrmBridgeSensorId
+ autoResumeTrackCurrentRetry
autoResumeTrackTimeout
- bluetoothPairing
bluetoothSensor
+ chartByDistance
+ chartShowCadence
+ chartShowElevation
+ chartShowHeartRate
+ chartShowPower
+ chartShowSpeed
defaultActivity
defaultMapPublic
maxRecordingDistance
@@ -33,36 +39,44 @@ limitations under the License.
minRecordingInterval
minRequiredAccuracy
pickExistingMap
+ pickStatisticsMarker
preferredAccount
+ recordingTrackId
reportSpeed
+ selectedTrackId
sendToDocs
sendToFusionTables
sendToMaps
sensorType
shareUrlOnly
+ showCheckUnitsDialog
+ showWelcomeDialog
splitFrequency
- trackColorModeDynamicVariation
-
- trackColorModeFixedMediumDisplay
-
- trackColorModeFixedMedium
- trackColorModeFixedSlowDisplay
-
- trackColorModeFixedSlow
+ statsShowCoordinate
+ statsShowElevation
+ statsShowGrade
+ statsUseTotalTime
+ trackColorModeMedium
+ trackColorModePercentage
+ trackColorModeSlow
trackColorMode
trackName
-
-
- autoResumeTrackCurrentRetry
- recordingTrackId
- selectedTrackId
-
-
- antOptions
- backupToSd
- resetToDefaults
- restoreFromSd
- sensorOptions
- trackColorModeFixedOptions
-
+
+ settingsBackup
+ settingsBackupNow
+ settingsBackupRestore
+ settingsChart
+ settingsMap
+ settingsMapMediumDisplay
+ settingsMapPercentageDisplay
+ settingsMapSlowDisplay
+ settingsRecording
+ settingsReset
+ settingsSensor
+ settingsSensorAnt
+ settingsSensorBluetooth
+ settingsSensorBluetoothPairing
+ settingsSensorRoot
+ settingsSharing
+ settingsStats
+
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index b6a28e4dd..7e03389db 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -416,30 +416,6 @@ limitations under the License.
Record and share your GPS tracks with My Tracks.
-
-
- By distance
-
-
- By time
-
-
- X axis
-
-
- Y axis
-
-
+ translation_description="Label for location altitude in meters.">
Altitude (m)
-
-
- Unable to export.
-
-
- Exporting all tracks...
-
-
- Export finished.
-
-
+
+ Add
+
Cancel
@@ -670,6 +634,10 @@ limitations under the License.
translation_description="The title on an alert dialog indicating error.">
Error
+
+ More options
+
Name
@@ -695,8 +663,8 @@ limitations under the License.
- Please tap here to go to \'Location & security\' settings & check
- \'Use GPS satellites\'. Press the back button to return.
+ Tap here to go to \'Location services\' settings & check \'GPS satellites\'. Press the back
+ button to return.
@@ -929,11 +897,6 @@ limitations under the License.
'Maps' list page informing the user that he doesn't have any maps.">
You don\'t have any maps.
-
- Pick a map:
-
@@ -946,8 +909,8 @@ limitations under the License.
- Your Google Maps
+ page asking the user to pick a map.">
+ Pick a Map
+ Unable to insert a marker. Try again.
+
+
+ A marker was inserted.
+
The marker will be permanently deleted from the phone.
-
+ Name: %1$s
+
+
Description: %1$s
-
Marker type: %1$s
-
- Name: %1$s
-
-
- Add
-
-
- Unable to insert a marker. Try again.
-
-
- A marker was inserted.
-
-
- New Marker
-
-
+
Marker type (e.g. building, pothole...)
-
+
Marker type
-
-
- Type
-
-
- Statistics
-
-
- Waypoint
-
+
You don\'t have any markers.
+
+ Statistics
+
+
+ Statistics %1$d
+
+
+ Type
+
+
+ Waypoint
+
+
+ Waypoint %1$d
+
+
Aggregated statistics
-
- Chart settings
-
Delete all
@@ -1057,25 +1022,13 @@ limitations under the License.
translation_description="In the menu, to edit a track or a marker.">
Edit
-
- Export all...
-
-
- Export as %1$s
-
Help
-
- Import all
+
+ Import from SD card
@@ -1089,10 +1042,6 @@ limitations under the License.
translation_description="In the menu, to show a list of markers for the current track.">
Markers
-
- My location
-
Play
@@ -1110,12 +1059,17 @@ limitations under the License.
submenu.">
Save to SD card...
+
+ Save all to SD card...
+
- As a %1$s file
+ Save as %1$s
@@ -1133,40 +1087,43 @@ limitations under the License.
translation_description="In the menu, to go to the settings page.">
Settings
+
+ Share
+
+
+ %1$s file
+
+
+ Fusion Table URL
+
+
+ Map URL
+
Show on map
-
+
Stop recording
-
- Share with friends...
-
-
- A %1$s file
-
-
- Fusion Table
-
-
- Map
-
+
+ My Location
+
@@ -1184,11 +1141,6 @@ limitations under the License.
translation_description="The My Tracks application name.">
My Tracks
-
- My Tracks Importer
-
- Imperial
+
+
+ Unable to save.
-
- Metric
+
+ Saving all tracks...
-
- Preferred units
+
+ Save finished.
-
+
- Tracks and waypoints
+ Tracks and markers
Search My Tracks
-
- No tracks or waypoints matched your search.
+
+ No tracks or markers matched your search.
-
In track \'%1$s\'.
@@ -1315,7 +1265,7 @@ limitations under the License.
- Speak the name of a track or waypoint.
+ Speak the name of a track or marker.
@@ -1481,7 +1431,7 @@ limitations under the License.
Sending
-
+
Restore all tracks and settings from the SD card.
-
- SD card
+
+
+ By distance
+
+
+ By time
+
+
+ X axis
-
- Display
+
+
+ Top medium speed
-
- Use metric
+
+ Percentage from average
-
- Use imperial units to display distances.
-
-
- Use metric units to display distances.
-
-
- Display speed
-
-
- Display pace (e.g., hours/mile).
-
-
- Display speed (e.g., miles/hour).
-
-
- Color mode
-
-
- Dynamic thresholds
-
-
- Percentage
-
-
Percentage from the average speed for the medium speed range.
-
+
+ Top slow speed
+
+
+ Track color mode
+
+
+ Dynamic thresholds
+
+
Fixed thresholds
-
- Medium speed
-
-
- Medium speed top value.
-
-
- Slow speed
-
-
- Slow speed top value.
-
-
+
Single color
-
+
The way to color a track based on slow, medium, and fast speed.
+
+
+
+ Show
+
Not available while recording a track.
+
+
Time/distance between two voice announcements.
+
+
Revert all your settings to the default values.
+
+
Unpair SRM ANT+ bridge
+
+
Remove any descriptive text when sharing a URL with friends.
-
- My Tracks settings
+
+
+
+ Latitude/Longitude
+
+
+ Grade
+
+
+ Pace (hr/mi)
+
+
+ Pace (hr/km)
+
+
+ Speed (mi/hr)
+
+
+ Speed (km/hr)
+
+
+ Preferred rate
+
+
+ Time measurement
+
+
+ Imperial (mi, ft)
+
+
+ Metric (km, m)
+
+
+ Preferred units
@@ -2068,81 +2021,81 @@ limitations under the License.
I think you might be interested in this track:\n\n%1$s
-
-
+
+
Average moving pace
-
+
Average moving speed
-
+
Average pace
-
+
Average speed
-
+
Elevation
-
+
Elevation gain
-
+
Fastest pace
-
+
Latitude
-
+
Longitude
-
+
Max elevation
-
+
Max grade
-
+
Max speed
-
+
Min elevation
-
+
Min grade
-
+
Moving time
-
+
Pace
-
+
Speed
-
+
Total distance
-
+
Total time
@@ -2279,7 +2232,7 @@ limitations under the License.
%1$.2f: a float number. E.g., '2.22'">
%1$.2f km
-
@@ -2350,6 +2303,12 @@ limitations under the License.
%1$d: an integer value. E.g., '2'">
%1$d km
+
+ %1$d km/h
+
%1$d mi
+
+ %1$d mi/h
+
Smallest (recommended)
-
+
+ %1$s \u00B0
+
+
+ Use My Tracks while you run, bike, hike, or do anything outdoor to record your path. While
+ recording, you can visualize your track and watch live statistics. You can also add
+ markers, have markers inserted periodically, or hear automatic voice announcements of
+ your progress. For recorded tracks, you can play them on Google Earth, share with friends, or
+ upload to Google Maps, Google Fusion Tables, or Google Docs.
+
Welcome to My Tracks
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index a8988005a..a3716c7f7 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -15,207 +15,151 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/backup_settings.xml b/MyTracks/res/xml/backup_settings.xml
new file mode 100644
index 000000000..e336832e9
--- /dev/null
+++ b/MyTracks/res/xml/backup_settings.xml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/chart_settings.xml b/MyTracks/res/xml/chart_settings.xml
new file mode 100644
index 000000000..011a75e5a
--- /dev/null
+++ b/MyTracks/res/xml/chart_settings.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/map_settings.xml b/MyTracks/res/xml/map_settings.xml
new file mode 100644
index 000000000..a3365a254
--- /dev/null
+++ b/MyTracks/res/xml/map_settings.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/preferences.xml b/MyTracks/res/xml/preferences.xml
deleted file mode 100644
index 3b6191c09..000000000
--- a/MyTracks/res/xml/preferences.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/MyTracks/res/xml/recording_settings.xml b/MyTracks/res/xml/recording_settings.xml
new file mode 100644
index 000000000..b79455ec4
--- /dev/null
+++ b/MyTracks/res/xml/recording_settings.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/search.xml b/MyTracks/res/xml/search.xml
index 46ce021ed..a4dfcbda5 100644
--- a/MyTracks/res/xml/search.xml
+++ b/MyTracks/res/xml/search.xml
@@ -1,11 +1,13 @@
\ No newline at end of file
+ android:hint="@string/search_hint"
+ android:imeOptions="actionSearch"
+ android:includeInGlobalSearch="true"
+ android:label="@string/my_tracks_app_name"
+ android:queryAfterZeroResults="true"
+ android:searchSettingsDescription="@string/search_global_description"
+ android:searchSuggestAuthority="com.google.android.maps.mytracks.search"
+ android:searchSuggestSelection=" ? "
+ android:searchSuggestThreshold="1"
+ android:voicePromptText="@string/search_voice_prompt"
+ android:voiceSearchMode="showVoiceSearchButton|launchRecognizer" />
diff --git a/MyTracks/res/xml/sensor_settings.xml b/MyTracks/res/xml/sensor_settings.xml
new file mode 100644
index 000000000..d7904d6a1
--- /dev/null
+++ b/MyTracks/res/xml/sensor_settings.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/settings.xml b/MyTracks/res/xml/settings.xml
new file mode 100644
index 000000000..ff24e55be
--- /dev/null
+++ b/MyTracks/res/xml/settings.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/sharing_settings.xml b/MyTracks/res/xml/sharing_settings.xml
new file mode 100644
index 000000000..04276f123
--- /dev/null
+++ b/MyTracks/res/xml/sharing_settings.xml
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/res/xml/stats_settings.xml b/MyTracks/res/xml/stats_settings.xml
new file mode 100644
index 000000000..9186c4a09
--- /dev/null
+++ b/MyTracks/res/xml/stats_settings.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AbstractMyTracksActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AbstractMyTracksActivity.java
new file mode 100644
index 000000000..b899016bc
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/AbstractMyTracksActivity.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.android.apps.mytracks;
+
+import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+
+import android.os.Bundle;
+import android.speech.tts.TextToSpeech;
+import android.support.v4.app.FragmentActivity;
+import android.view.MenuItem;
+
+/**
+ * An abstract class for all My Tracks activities.
+ *
+ * @author Jimmy Shih
+ */
+public class AbstractMyTracksActivity extends FragmentActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setVolumeControlStream(TextToSpeech.Engine.DEFAULT_STREAM);
+ ApiAdapterFactory.getApiAdapter().configureActionBarHomeAsUp(this);
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if (item.getItemId() != android.R.id.home) {
+ return super.onOptionsItemSelected(item);
+ }
+ onHomeSelected();
+ return true;
+ }
+
+ /**
+ * Callback when the home menu item is selected.
+ */
+ protected void onHomeSelected() {
+ finish();
+ }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index f36cf6549..70edb2f37 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -1,128 +1,59 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
package com.google.android.apps.mytracks;
import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
import com.google.android.apps.mytracks.content.Track;
import com.google.android.apps.mytracks.stats.TripStatistics;
-import com.google.android.apps.mytracks.util.ApiAdapterFactory;
+import com.google.android.apps.mytracks.util.StatsUtils;
import com.google.android.maps.mytracks.R;
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.MenuItem;
-import android.widget.ScrollView;
-import android.widget.TextView;
import java.util.List;
/**
- * Activity for viewing the combined statistics for all the recorded tracks.
- *
- * Other features to add - menu items to change setings.
+ * An activity to view aggregated stats from all recorded tracks.
*
* @author Fergus Nelson
*/
-public class AggregatedStatsActivity extends Activity implements
- OnSharedPreferenceChangeListener {
-
- private final StatsUtilities utils;
-
- private MyTracksProviderUtils tracksProvider;
-
- private boolean metricUnits = true;
-
- public AggregatedStatsActivity() {
- this.utils = new StatsUtilities(this);
- }
-
- @Override
- public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
- String key) {
- Log.d(Constants.TAG, "StatsActivity: onSharedPreferences changed "
- + key);
- if (key != null) {
- if (key.equals(getString(R.string.metric_units_key))) {
- metricUnits = sharedPreferences.getBoolean(
- getString(R.string.metric_units_key), true);
- utils.setMetricUnits(metricUnits);
- utils.updateUnits();
- loadAggregatedStats();
- }
- }
- }
+public class AggregatedStatsActivity extends AbstractMyTracksActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
- this.tracksProvider = MyTracksProviderUtils.Factory.get(this);
-
- ApiAdapterFactory.getApiAdapter().configureActionBarHomeAsUp(this);
-
- setContentView(R.layout.stats);
-
- ScrollView sv = ((ScrollView) findViewById(R.id.scrolly));
- sv.setScrollBarStyle(ScrollView.SCROLLBARS_OUTSIDE_INSET);
-
- SharedPreferences preferences = getSharedPreferences(
- Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
- if (preferences != null) {
- metricUnits = preferences.getBoolean(getString(R.string.metric_units_key), true);
- preferences.registerOnSharedPreferenceChangeListener(this);
- }
- utils.setMetricUnits(metricUnits);
- utils.updateUnits();
- utils.setSpeedLabel(R.id.speed_label, R.string.stat_speed, R.string.stat_pace);
- utils.setSpeedLabels();
-
- DisplayMetrics metrics = new DisplayMetrics();
- getWindowManager().getDefaultDisplay().getMetrics(metrics);
- if (metrics.heightPixels > 600) {
- ((TextView) findViewById(R.id.speed_register)).setTextSize(80.0f);
- }
- loadAggregatedStats();
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- if (item.getItemId() != android.R.id.home) {
- return false;
- }
- startActivity(new Intent(this, TrackListActivity.class)
- .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK));
- return true;
+ setContentView(R.layout.aggregated_stats);
+ StatsUtils.setTripStatisticsValues(this, getTripStatistics());
+ StatsUtils.setLocationValues(this, null, false);
}
/**
- * 1. Reads tracks from the db
- * 2. Merges the trip stats from the tracks
- * 3. Updates the view
+ * Gets the aggregated trip statistics for all the recorded tracks or null if
+ * there is no track.
*/
- private void loadAggregatedStats() {
- List