merge heads

MyTracks/res/layout/mytracks_waypoint_details.xml

@@ -49,8 +49,7 @@ limitations under the License.
          android:layout_width="fill_parent"
          android:layout_height="wrap_content"
          android:singleLine="true"
-         android:autoText="true"
-         android:capitalize="words"
+         android:inputType="textAutoCorrect|textCapWords"
          android:selectAllOnFocus="true"
          android:hint="@string/marker_detail_marker_name"
          android:imeOptions="actionNext"/>
@@ -78,8 +77,7 @@ limitations under the License.
           android:layout_width="fill_parent"
           android:layout_height="0dp"
           android:singleLine="false"
-          android:autoText="true"
-          android:capitalize="sentences"
+          android:inputType="textAutoCorrect|textCapSentences"
           android:selectAllOnFocus="true"
           android:minLines="5"
           android:maxLines="50"

MyTracks/res/layout/stats.xml

@@ -204,8 +204,6 @@ limitations under the License.
             style="@style/StatsUnit" />
           <TextView
 	          style="@style/StatsDivider" />
-            android:layout_height="3dp"
-            android:layout_width="fill_parent" />
           <TextView
             android:id="@+id/average_moving_speed_unit_label_bottom"
             style="@style/StatsUnit" />

MyTracks/res/layout/track_detail.xml

@@ -52,8 +52,7 @@ limitations under the License.
           android:src="@drawable/track"
           />
         <EditText
-          android:autoText="true"
-          android:capitalize="words"
+          android:inputType="textAutoCorrect|textCapWords"
           android:hint="@string/track_detail_track_name"
           android:id="@+id/track_detail_track_name"
           android:imeOptions="actionNext"
@@ -81,8 +80,7 @@ limitations under the License.
         android:text="@string/track_detail_track_description"
         />
       <EditText
-        android:autoText="true"
-        android:capitalize="sentences"
+        android:inputType="textAutoCorrect|textCapSentences"
         android:hint="@string/track_detail_track_description"
         android:id="@+id/track_detail_track_description"
         android:imeOptions="actionDone"

MyTracks/res/layout/track_widget.xml

@@ -54,7 +54,7 @@ limitations under the License.
           style="@style/WidgetTextView"
           android:text="@string/stat_total_distance" />
       </LinearLayout>
-      <ImageView
+      <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="1dp"
         android:background="@color/appwidget_hr" />
@@ -70,7 +70,7 @@ limitations under the License.
           style="@style/WidgetTextView"
           android:text="@string/stat_moving_time" />
       </LinearLayout>
-      <ImageView
+      <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="1dp"
         android:background="@color/appwidget_hr" />

MyTracks/res/layout/upload_result.xml

@@ -18,20 +18,16 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_margin="8dp"
   android:layout_width="fill_parent" >
-
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical" >
-
     <!-- Google Maps result -->
-
     <LinearLayout
       android:id="@+id/upload_result_maps_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_maps_result_icon"
@@ -39,35 +35,29 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_maps" />
-
+          android:text="@string/send_google_maps"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_maps_url" />
+          android:text="@string/send_google_maps_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Google Fusion Tables result -->
-
     <LinearLayout
       android:id="@+id/upload_result_fusion_tables_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_fusion_tables_result_icon"
@@ -75,35 +65,29 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_fusion_tables" />
-
+          android:text="@string/send_google_fusion_tables"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_fusion_tables_url" />
+          android:text="@string/send_google_fusion_tables_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Google Docs result -->
-
     <LinearLayout
       android:id="@+id/upload_result_docs_result"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="horizontal" >
-
       <ImageView
         android:contentDescription="@string/generic_success_title"
         android:id="@+id/upload_result_docs_result_icon"
@@ -111,44 +95,37 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
-
       <LinearLayout
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
-
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_docs" />
-
+          android:text="@string/send_google_docs"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <TextView
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Small"
-          android:text="@string/send_google_docs_url" />
+          android:text="@string/send_google_docs_url"
+          style="@android:style/TextAppearance.DeviceDefault.Small" />
       </LinearLayout>
     </LinearLayout>
-
     <!-- Footer -->
-
     <TextView
       android:id="@+id/upload_result_success_footer"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:padding="8dp"
-      style="@android:style/TextAppearance.DeviceDefault.Small"
-      android:text="@string/send_google_success_footer" />
-
+      android:text="@string/send_google_success_footer"
+      style="@android:style/TextAppearance.DeviceDefault.Small" />
     <TextView
       android:id="@+id/upload_result_error_footer"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:padding="8dp"
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/send_google_error" />
+      android:text="@string/send_google_error"
+      style="@android:style/TextAppearance.DeviceDefault.Medium" />
   </LinearLayout>
-
 </ScrollView>

MyTracks/res/layout/upload_service_chooser.xml

@@ -17,89 +17,75 @@ limitations under the License.
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent" >
-
   <TableLayout
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:layout_width="fill_parent"
     android:stretchColumns="1" >
-
     <TableRow android:id="@+id/send_google_maps_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_maps"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/maps_icon" />
-
       <CheckBox
         android:id="@+id/send_google_maps"
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_maps" />
+        android:text="@string/send_google_maps"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
-
     <TableRow android:id="@+id/send_google_maps_option_row" >
-
       <RadioGroup
         android:layout_column="1"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp" >
-
         <RadioButton
           android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_new_map" />
-
+          android:text="@string/send_google_new_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
         <RadioButton
           android:id="@+id/send_google_existing_map"
           android:layout_height="wrap_content"
           android:layout_width="wrap_content"
-          style="@android:style/TextAppearance.DeviceDefault.Medium"
-          android:text="@string/send_google_existing_map" />
+          android:text="@string/send_google_existing_map"
+          style="@android:style/TextAppearance.DeviceDefault.Medium" />
       </RadioGroup>
     </TableRow>
-
     <TableRow android:id="@+id/send_google_fusion_tables_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_fusion_tables"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/googledocs_icon" />
-
       <CheckBox
         android:id="@+id/send_google_fusion_tables"
         android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_fusion_tables" />
+        android:text="@string/send_google_fusion_tables"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
     <TableRow android:id="@+id/send_google_docs_row" >
-
       <ImageView
         android:contentDescription="@string/send_google_docs"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:src="@drawable/googledocs_icon" />
-
       <CheckBox
         android:id="@+id/send_google_docs"
         android:layout_gravity="center_vertical"
         android:layout_height="fill_parent"
         android:layout_marginLeft="8dp"
         android:layout_width="0dp"
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/send_google_docs" />
+        android:text="@string/send_google_docs"
+        style="@android:style/TextAppearance.DeviceDefault.Medium" />
     </TableRow>
   </TableLayout>
-
 </ScrollView>

MyTracks/res/menu/main.xml

@@ -15,78 +15,61 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
   <item
-    android:icon="@drawable/ic_menu_recordtrack"
+    android:icon="@drawable/menu_record_track"
     android:id="@+id/menu_record_track"
     android:showAsAction="always"
     android:title="@string/menu_record_track"/>
-
   <item
-    android:icon="@drawable/ic_menu_stoprecording"
+    android:icon="@drawable/menu_stop_recording"
     android:id="@+id/menu_stop_recording"
     android:showAsAction="always"
     android:title="@string/menu_stop_recording"/>
-
   <item
     android:icon="@drawable/ic_menu_tracklist"
     android:id="@+id/menu_tracks"
     android:showAsAction="ifRoom"
     android:title="@string/menu_tracks"/>
-
   <item
     android:icon="@drawable/ic_menu_waypoints"
     android:id="@+id/menu_markers"
     android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
-
   <item
     android:icon="@drawable/ic_menu_chartsettings"
     android:id="@+id/menu_chart_settings"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_chart_view_chart_settings"
+    android:title="@string/menu_chart_settings"
     android:visible="false"/>
-
   <item
     android:icon="@android:drawable/ic_menu_mylocation"
     android:id="@+id/menu_my_location"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_map_view_my_location"
+    android:title="@string/menu_my_location"
     android:visible="false"/>
-
   <item
     android:icon="@android:drawable/ic_menu_mapmode"
     android:id="@+id/menu_satellite_mode"
     android:showAsAction="ifRoom"
-    android:title="@string/menu_map_view_satellite_mode"
+    android:title="@string/menu_satellite_mode"
     android:visible="false"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_search"
+    android:icon="@drawable/menu_search"
     android:id="@+id/menu_search"
     android:title="@string/menu_search"/>
-
   <item
     android:icon="@drawable/ic_menu_sensorstatus"
     android:id="@+id/menu_sensor_state"
-    android:orderInCategory="1000"
     android:title="@string/menu_sensor_state"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_preferences"
+    android:icon="@drawable/menu_settings"
     android:id="@+id/menu_settings"
-    android:orderInCategory="1001"
     android:title="@string/menu_settings"/>
-
   <item
     android:id="@+id/menu_aggregated_statistics"
-    android:orderInCategory="1002"
     android:title="@string/menu_aggregated_statistics"/>
-
   <item
-    android:icon="@android:drawable/ic_menu_info_details"
+    android:icon="@drawable/menu_help"
     android:id="@+id/menu_help"
-    android:orderInCategory="1003"
     android:title="@string/menu_help"/>
-
 </menu>

MyTracks/res/menu/search_only.xml

@@ -16,7 +16,7 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@android:drawable/ic_menu_search"
+    android:icon="@drawable/menu_search"
     android:id="@+id/menu_search"
     android:showAsAction="always"
     android:title="@string/menu_search"/>

MyTracks/res/values/strings.xml

@@ -461,7 +461,7 @@ limitations under the License.
   <!-- Description -->
   <string name="description_activity_type"
     translation_description="Activity type description.
-    
+
       %1$s activity type. E.g., 'hiking'">
     Activity type: %1$s
   </string>
@@ -476,7 +476,7 @@ limitations under the License.
     translation_description="Average moving speed description.
 
       %1$.2f speed in kilometers per hour
-      %2$.1f speed in miles per hour">    
+      %2$.1f speed in miles per hour">
     Average moving speed: %1$.2f km/h (%2$.1f mi/h)
   </string>
   <string name="description_average_pace"
@@ -495,7 +495,7 @@ limitations under the License.
   </string>
   <string name="description_elevation_gain"
     translation_description="Elevation gain description.
-    
+
       %1$d elevation in meters
       %2$d elevation in feet">
     Elevation gain: %1$d m (%2$d ft)
@@ -530,14 +530,14 @@ limitations under the License.
   </string>
   <string name="description_max_elevation"
     translation_description="Max elevation description.
-    
+
       %1$d elevation in meters
       %2$d elevation in feet">
     Max elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_max_grade"
     translation_description="Max grade description.
-    
+
       %1$d grade in percentage">
     Max grade: %1$d %%
   </string>
@@ -550,14 +550,14 @@ limitations under the License.
   </string>
   <string name="description_min_elevation"
     translation_description="Min elevation description.
-    
+
       %1$d elevation in meters
       %2$d elevation in feet">
     Min elevation: %1$d m (%2$d ft)
   </string>
   <string name="description_min_grade"
     translation_description="Min grade description.
-    
+
       %1$d grade in percentage">
     Min grade: %1$d %%
   </string>
@@ -570,13 +570,13 @@ limitations under the License.
   </string>
   <string name="description_moving_time"
     translation_description="Moving time description.
-    
+
       %1$s time. E.g., '1:08:59'">
     Moving time: %1$s
   </string>
   <string name="description_recorded_time"
     translation_description="Recorded time description.
-      
+
       %1$s time. E.g, '2/15/2012 1:40 PM'">
     Recorded: %1$s
   </string>
@@ -606,14 +606,14 @@ limitations under the License.
   </string>
   <string name="description_total_distance"
     translation_description="Total distance description.
-      
+
       %1$.2f distance in kilometers
       %2$.1f distance in miles">
     Total distance: %1$.2f km (%2$.1f mi)
   </string>
   <string name="description_total_time"
     translation_description="Total time description.
-  
+
       %1$s time. E.g., '1:08:59'">
     Total time: %1$s
   </string>
@@ -643,15 +643,12 @@ limitations under the License.
   <string name="eula_body"
     translation_description="The body in the 'Terms of Service. See http://m.google.com/toscountry.
 
-      %1$s: host name, 'm.google.com'
-      %2$s: host name, 'm.google.com'
-      %3$s: host name, 'm.google.com'
-      %4$s: host name, 'm.google.com'">
+      %1$s: host name, 'm.google.com'">
     By using Google\'s mobile products and services ("Services"), you agree to be bound by a) the
     YouTube Terms of Use (%1$s/tos_youtube) for YouTube-related Services, b) the Google Maps Terms
-    and Conditions (%2$s/tos_maps) for mapping, local and location-based Services, c) the Google
-    Books Terms of Service (%3$s/tos_books) for Books-related Services, and e) the Google Terms of
-    Service (%4$s/utos) for all other Services, as updated from time to time.  
+    and Conditions (%1$s/tos_maps) for mapping, local and location-based Services, c) the Google
+    Books Terms of Service (%1$s/tos_books) for Books-related Services, and e) the Google Terms of
+    Service (%1$s/utos) for all other Services, as updated from time to time.
   </string>
   <string name="eula_title"
     translation_description="The title for the 'Terms of Service' dialog.">
@@ -689,10 +686,6 @@ limitations under the License.
     translation_description="The title on an alert dialog indicating error.">
     Error
   </string>
-  <string name="generic_no"
-    translation_description="The text on a button to say no.">
-    No
-  </string>
   <string name="generic_ok"
     translation_description="The text on a button to say ok.">
     OK
@@ -713,10 +706,6 @@ limitations under the License.
       Screenshot: sd_card_success_write_file.png">
     Success
   </string>
-  <string name="generic_yes"
-    translation_description="The text on a button to say yes.">
-    Yes
-  </string>
 
   <!-- GPS -->
   <string name="gps_need_to_enable"
@@ -977,80 +966,55 @@ limitations under the License.
 
   <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
-    translation_description="In the menu, to go to the aggregated statistics page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the aggregated statistics page.">
     Aggregated statistics
   </string>
-  <string name="menu_chart_view_chart_settings"
-    translation_description="In the menu for the chart view, to change the chart settings.
-
-      Screenshot: menu_chart_settings.png">
+  <string name="menu_chart_settings"
+    translation_description="In the menu, to change the chart settings.">
     Chart settings
   </string>
   <string name="menu_help"
-    translation_description="In the menu, to go to the help page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the help page.">
     Help
   </string>
-  <string name="menu_map_view_map_mode"
-    translation_description="In the menu for the map view, to switch the display to the map mode.
-
-      Screenshot: menu_map_mode.png">
+  <string name="menu_map_mode"
+    translation_description="In the menu, to switch the display to the map mode.">
     Map mode
   </string>
-  <string name="menu_map_view_my_location"
-    translation_description="In the menu for the map view, to display user's current location.
-
-      Screenshot: menu_record_track.png">
-    My location
-  </string>
-  <string name="menu_map_view_satellite_mode"
-    translation_description="In the menu for the map view, to switch the display to the satellite
-      mode.
-
-      Screenshot: menu_record_track.png">
-    Satellite mode
-  </string>
   <string name="menu_markers"
-    translation_description="In the menu, to show a list of markers for the current track.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to show a list of markers for the current track.">
     Markers
   </string>
+  <string name="menu_my_location"
+    translation_description="In the menu, to display the user's current location.">
+    My location
+  </string>
   <string name="menu_record_track"
-    translation_description="In the menu, to start recording a track.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to start recording a track.">
     Record track
   </string>
+  <string name="menu_satellite_mode"
+    translation_description="In the menu, to switch the display to the satellite mode.">
+    Satellite mode
+  </string>
   <string name="menu_search"
     translation_description="In the menu, to start a textual search for tracks or waypoints.">
     Search
   </string>
   <string name="menu_sensor_state"
-    translation_description="In the menu, to go to the sensor state page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the sensor state page.">
     Sensor state
   </string>
   <string name="menu_settings"
-    translation_description="In the menu, to go to the settings page.
-
-      Screenshot: menu_record_track_more.png">
+    translation_description="In the menu, to go to the settings page.">
     Settings
   </string>
   <string name="menu_stop_recording"
-    translation_description="In the menu, to stop recording a track.
-
-      Screenshot: menu_stop_recording.png">
+    translation_description="In the menu, to stop recording a track.">
     Stop recording
   </string>
   <string name="menu_tracks"
-    translation_description="In the menu, to show a list of all the tracks.
-
-      Screenshot: menu_record_track.png">
+    translation_description="In the menu, to show a list of all the tracks.">
     Tracks
   </string>
 
@@ -1298,7 +1262,7 @@ limitations under the License.
   <string name="send_google_no_service_selected"
     translation_description="When sending a track to Google, a message indicating that the user has
       not selected any Google service and no data is sent.">
-    You did not select any service. No data is sent.
+    You did not select any service. The track was not sent.
   </string>
   <string name="send_google_progress_message"
     translation_description="When sending a track to a Google service, the progress message.
@@ -2511,14 +2475,6 @@ limitations under the License.
     translation_description="Abbreviation for minutes. E.g, '2 min'.">
     min
   </string>
-  <string name="unit_minute_per_kilometer"
-    translation_description="Abbreviation for minutes per kilometer. E.g, '5 min/km'.">
-    min/km
-  </string>
-  <string name="unit_minute_per_mile"
-    translation_description="Abbreviation for minutes per mile. E.g, '5 min/mi'.">
-    min/mi
-  </string>
 
   <!-- Value -->
   <string name="value_adapt_accuracy"