Merge with 25704964a526fcfe09919af8f29c1e526b5409ec

MyTracks/res/drawable/left_arrow_chart_stateful.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-      android:drawable="@drawable/btn_arrow_left_default" />
+        android:drawable="@drawable/left_arrow_chart" />
 
   <item android:state_pressed="true"
-      android:drawable="@drawable/btn_arrow_left_press" />
+        android:drawable="@drawable/left_arrow_chart_press" />
 
-  <item android:drawable="@drawable/btn_arrow_left_default" />
+  <item android:drawable="@drawable/left_arrow_chart" />
 
 </selector>

MyTracks/res/drawable/left_arrow_stats_stateful.xml

@@ -17,11 +17,11 @@ limitations under the License.
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
   <item android:state_window_focused="false"
-      android:drawable="@drawable/btn_arrow_right_default" />
+        android:drawable="@drawable/left_arrow_stats" />
 
   <item android:state_pressed="true"
-      android:drawable="@drawable/btn_arrow_right_press" />
+        android:drawable="@drawable/left_arrow_stats_press" />
 
-  <item android:drawable="@drawable/btn_arrow_right_default" />
+  <item android:drawable="@drawable/left_arrow_stats" />
 
 </selector>

MyTracks/res/drawable/left_arrow_track_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/left_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/left_arrow_track_press" />
+
+  <item android:drawable="@drawable/left_arrow_track" />
+
+</selector>

MyTracks/res/drawable/right_arrow_chart_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_chart" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_chart_press" />
+
+  <item android:drawable="@drawable/right_arrow_chart" />
+
+</selector>

MyTracks/res/drawable/right_arrow_stats_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_stats" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_stats_press" />
+
+  <item android:drawable="@drawable/right_arrow_stats" />
+
+</selector>

MyTracks/res/drawable/right_arrow_track_stateful.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item android:state_window_focused="false"
+        android:drawable="@drawable/right_arrow_track" />
+
+  <item android:state_pressed="true"
+        android:drawable="@drawable/right_arrow_track_press" />
+
+  <item android:drawable="@drawable/right_arrow_track" />
+
+</selector>

MyTracks/res/menu/main.xml

@@ -20,10 +20,15 @@
     android:icon="@android:drawable/ic_menu_preferences"
     android:orderInCategory="1001"
     android:title="@string/settings"/>
+    
+  <item android:id="@+id/menu_aggregated_stats"
+    android:icon="@android:drawable/ic_menu_info_details"
+    android:orderInCategory="1002"
+    android:title="@string/aggregated_stats"/>
 
   <item android:id="@+id/menu_help"
     android:icon="@android:drawable/ic_menu_info_details"
-    android:orderInCategory="1002"
+    android:orderInCategory="1003"
     android:title="@string/help"/>
 
 </menu>

MyTracks/res/values-de/strings.xml

@@ -155,7 +155,6 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Dauer zwischen Ansagen:</string>
   <string name="settings_announcement_frequency_summary">Kürzeste Zeit zwichen zwei Ansagen</string>
-  <string name="settings_announcement_not_available_summary">Gesprochene Ansagen sind mit Ihrer Version von Android nicht verfügbar.</string>
 
   <string name="settings_min_recording_distance">Kleinste Entfernung zwischen Punkten:</string>
   <string name="settings_min_recording_distance_summary">Kleinste Entfernung zwischen zwei Positionsaufzeichnungen</string>

MyTracks/res/values-es/strings.xml

@@ -158,7 +158,6 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Tiempo entre anuncios</string>
   <string name="settings_announcement_frequency_summary">Tiempo mínimo entre dos anuncios de voz</string>
-  <string name="settings_announcement_not_available_summary">Conversión de anuncios de texto a voz no esta disponible en su versión de Android</string>
 
   <string name="settings_min_recording_distance">Distancia mínima entre puntos consecutivos</string>
   <string name="settings_min_recording_distance_summary">Distancia mínima entre dos grabaciones de posición</string>

MyTracks/res/values-fr/strings.xml

@@ -158,7 +158,6 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Fréquence des annonces</string>
   <string name="settings_announcement_frequency_summary">Temps minimum entre eux annonces vocales</string>
-  <string name="settings_announcement_not_available_summary">La synthèse vocale n\'est pas disponible pour cette version d\'Android</string>
 
   <string name="settings_min_recording_distance">Distance min. entre 2 points</string>
   <string name="settings_min_recording_distance_summary">Plus petite distance entre deux enregistrements de votre position</string>

MyTracks/res/values-it/strings.xml

@@ -164,7 +164,6 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Intervallo fra due annunci:</string>
   <string name="settings_announcement_frequency_summary">Tempo minimo fra due annunci audio</string>
-  <string name="settings_announcement_not_available_summary">Gli annunci audio non sono disponibili in questa varsione di Android</string>
 
   <string name="settings_min_recording_distance">Distanza minima fra due punti successivi:</string>
   <string name="settings_min_recording_distance_summary">Distanza minima fra due successive registrazioni della posizione</string>

MyTracks/res/values-ja/strings.xml

@@ -164,7 +164,7 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">定期通知</string>
   <string name="settings_announcement_frequency_summary">音声通知間隔の最小時間</string>
-  <string name="settings_announcement_not_available_summary">お使いのAndroidの版では音声読み上げ機能がありません</string>
+  
 
   <string name="settings_min_recording_distance">ポイント間の最短距離</string>
   <string name="settings_min_recording_distance_summary">位置記録間の最短距離</string>

MyTracks/res/values-pl/strings.xml

@@ -164,7 +164,7 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Częstotliwość komunikatów</string>
   <string name="settings_announcement_frequency_summary">Minimalny czas między dwoma komunikatami głosowymi</string>
-  <string name="settings_announcement_not_available_summary">Brak wsparcia dla syntezy mowy w twojej wersji Androida</string>
+  
 
   <string name="settings_min_recording_distance">Min. odległość między punktami</string>
   <string name="settings_min_recording_distance_summary">Najmniejsza odległość między dwoma zapisami twojej pozycji</string>

MyTracks/res/values-pt-rBR/strings.xml

@@ -157,7 +157,6 @@ limitations under the License.
   <string name="settings_sharing">Compartilhamento</string>
   <string name="settings_announcement_frequency">Tempo entre anúncios</string>
   <string name="settings_announcement_frequency_summary">Tempo mínimo entre dois anúncios de voz</string>
-  <string name="settings_announcement_not_available_summary">Anúncios de voz não estão disponíveis em sua versão do Android</string>
   <string name="settings_min_recording_distance">Dist. mín. entre pontos</string>
   <string name="settings_min_recording_distance_summary">Menor distância entre duas gravações da sua posição</string>
   <string name="settings_max_recording_distance">Dist. máx. entre pontos</string>

MyTracks/res/values-sv/strings.xml

@@ -43,19 +43,19 @@ limitations under the License.
   <string name="error_generic">Ett fel uppstod. Försök igen.</string>
   <string name="error_track_does_not_exist">Spåret finns inte.</string>
   <string name="error_out_of_memory">Den här filen är för stor (måste vara mindre än 500 KB). Avbryter.</string>
-  <string name="error_unable_to_insert_marker">Kan inte skapa markör. Ingen possition tillgänglig.</string>
+  <string name="error_unable_to_insert_marker">Kan inte skapa markör. Ingen position tillgänglig.</string>
 
   <!-- Status messages -->
-  <string name="wait_for_fix">Väntar på bättre GPS-posstion. Se till att himlen är synlig.</string>
+  <string name="wait_for_fix">Väntar på bättre GPS-position. Se till att himlen är synlig.</string>
   <string name="status_now_recording">Spelar nu in ett nytt spår.</string>
   <string name="status_stopped_recording">Stoppade inspelning av ditt spår.</string>
   <string name="status_new_mymap_has_been_created">En ny Google My Map har skapats på maps.google.com.</string>
   <string name="status_tracks_have_been_uploaded">Ditt spår har skickats till maps.google.com.</string>
-  <string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skockats till ett nytt kalkylblad på docs.google.com.</string>
+  <string name="status_tracks_have_been_uploaded_to_new_doc">Ditt spår har skickats till ett nytt kalkylblad på docs.google.com.</string>
   <string name="status_tracks_have_been_uploaded_to_docs">Ditt spår har skickats till docs.google.com.</string>
   <string name="status_mymap_info">Det kan ibland ta några minuter innan nya spår visas.</string>
   <string name="status_enable_gps">Klicka här för att gå till Säkerhet och Platsinställningar och kryssa i \'aktivera gps-satteliter\'. Tryck på tillbakaknappen för att återgå.</string>
-  <string name="status_approximate_location">OBS: En ungerfärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
+  <string name="status_approximate_location">OBS: En ungefärlig position som avgörs från mobilmaster och WIFI-nät visas.</string>
   <string name="status_no_location">En position kan för närvarande inte fastställas. Aktivera mer platskällor (se Säkerhet och Platsinställningar) och se till att himlen är synlig. Försök igen senare.</string>
   <string name="status_waypoint_inserted">En positionsmarkör har lagts in.</string>
   <string name="status_statistics_inserted">En statistikmarkör har lagts in.</string>
@@ -71,7 +71,7 @@ limitations under the License.
   <string name="progress_message_sending_mymaps">Skickar spår till Google Maps...</string>
   <string name="progress_message_creating_map">Skapar en ny My Map...</string>
   <string name="import_progress_message">Importerar ett GPS-spår. Detta kan ta en stund.</string>
-  <string name="write_progress_message">Skriver til till SD-kortet. Detta kan ta en stund.</string>
+  <string name="write_progress_message">Skriver till SD-kortet. Detta kan ta en stund.</string>
   <string name="progress_message_updating_track">Uppdaterar spårstatistik...</string>
 
   <!-- Used by DeleteAllDataHandler -->
@@ -125,7 +125,7 @@ limitations under the License.
   <!-- Export All -->
   <string name="tracklist_btn_export_all">Exportera alla spår</string>
   <string name="export_done">Exporteringen slutfördes</string>
-  <string name="tracklist_pick_one">Välj ett spår. TryckPress&amp;håll för fler alternativ.</string>
+  <string name="tracklist_pick_one">Välj ett spår. Tryck&amp;håll för fler alternativ.</string>
   <string name="tracklist_all_tracks">Alla spår:</string>
   <string name="tracklist_this_track">Det här spåret</string>
   <string name="tracklist_share_track">Dela med vänner...</string>
@@ -143,13 +143,13 @@ limitations under the License.
   <string name="waypointslist_show_waypoint">Visa på karta</string>
   <string name="waypointslist_btn_insert_waypoint">Infoga positionspunkt</string>
   <string name="waypointslist_btn_insert_statistics">Infoga statistik</string>
-  <string name="waypointslist_pick_one">Välj en markör. TryckPress&amp;håll för fler alternativ.</string>
+  <string name="waypointslist_pick_one">Välj en markör. Tryck&amp;håll för fler alternativ.</string>
 
   <!-- MyTracks Details -->
   <string name="trackdetails_title">Spårdetaljer</string>
   <string name="trackdetails_name">Spårnamn</string>
   <string name="trackdetails_description">Spårbeskrivning</string>
-  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, låpning, klättring...)</string>
+  <string name="trackdetails_category">Aktivitetstyp (t ex vandring, cyckling, löpning, klättring...)</string>
 
   <!-- MyTracks Waypoint Details -->
   <string name="waypointdetails_title">Markördetaljer</string>
@@ -165,7 +165,7 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">Meddelandefrekvens</string>
   <string name="settings_announcement_frequency_summary">Minimumtid mellan två röstmeddelanden</string>
-  <string name="settings_announcement_not_available_summary">Text-till-talmeddelanden är inte tillgängligt i din version av Android</string>
+  
 
   <string name="settings_min_recording_distance">Min distans mellan två punkter</string>
   <string name="settings_min_recording_distance_summary">Minsta distans mellan två inspelningar av din position</string>
@@ -199,11 +199,11 @@ limitations under the License.
   <string name="settings_signal_sampling_frequency_summary">Tid mellan två inspelningar av telefonens signalstyrka</string>
 
   <string name="settings_split_frequency">Delningsfrekvens</string>
-  <string name="settings_split_frequency_summary">Maximala tiden eller distansen varefter en ny delnginsmarkör kommer infogas</string>
+  <string name="settings_split_frequency_summary">Maximala tiden eller distansen varefter en ny delningsmarkör kommer infogas</string>
   <string name="pace_label">Tempo</string>
 
   <!-- MyTracksSky -->
-  <string name="mytracks_sky">GPS-satteliter</string>
+  <string name="mytracks_sky">GPS-satelliter</string>
 
   <!-- My Maps -->
   <string name="select_map_message">Välje en karta från ditt konto:</string>
@@ -240,7 +240,7 @@ limitations under the License.
   <!-- Visibility -->
   <string name="public_map">Publik</string>
   <string name="unlisted_map">Olistat</string>
-  <string name="mapslist_no_maps_available">Du har inge kartor än.</string>
+  <string name="mapslist_no_maps_available">Du har inga kartor än.</string>
 
   <!-- Statistics View -->
   <!-- Average Moving -->
@@ -253,7 +253,7 @@ limitations under the License.
 
   <string name="elevation_chart_name">Höjddiagram</string>
   <string name="elevation_gain_label">Höjdvinst</string>
-  <string name="elevation_label">Höjt</string>
+  <string name="elevation_label">Höjd</string>
   <string name="latitude_label">Latitud</string>
   <string name="longitude_label">Longitud</string>
 

MyTracks/res/values-zh-rCN/strings.xml

@@ -167,7 +167,7 @@ limitations under the License.
 
   <string name="settings_announcement_frequency">提示频度</string>
   <string name="settings_announcement_frequency_summary">语音提示的最小时间间隔</string>
-  <string name="settings_announcement_not_available_summary">你所使用的 Android 版本不支持文本到语音转换</string>
+  
 
   <string name="settings_min_recording_distance">最小记录间距</string>
   <string name="settings_min_recording_distance_summary">位置记录的最小间隔距离</string>

MyTracks/res/values/keys.xml

@@ -38,6 +38,7 @@ limitations under the License.
   <string name="share_url_only_key">shareUrlOnly</string>
   <string name="signal_sampling_frequency_key">signalSamplingFrequency</string>
   <string name="split_frequency_key">splitFrequency</string>
+  <string name="debug_draw_bounds_key">debugDrawBounds</string>
 
   <!-- Preference keys which keep transient state (not user preferences) - DO NOT TRANSLATE -->
   <string name="recording_track_key">recordingTrack</string>

MyTracks/res/values/strings.xml

@@ -32,6 +32,7 @@ limitations under the License.
   <string name="choose_track_message">Please select the track to view</string>
   <string name="current_track">Current track</string>
   <string name="current_segment">Last segment</string>
+  <string name="aggregated_stats">Aggregated Statistics</string>
 
   <!-- Error messages -->
   <string name="error_no_location_manager">No location manager was found on this device!</string>

MyTracks/res/xml/preferences.xml

@@ -133,4 +133,13 @@ limitations under the License.
           android:persistent="false" />
     </PreferenceCategory>
   </PreferenceScreen>
+
+  <!-- Debug settings - uncomment this while debugging only -->
+  <!-- 
+  <PreferenceScreen android:title="Debug">
+    <CheckBoxPreference android:key="@string/debug_draw_bounds_key"
+                        android:title="Draw bounding box"
+                        android:defaultValue="false" />
+  </PreferenceScreen>
+  -->
 </PreferenceScreen>