merge heads

MyTracks/res/layout/upload_result.xml

@@ -57,7 +57,6 @@ limitations under the License.
             android:text="@string/send_google_maps"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_maps_url"
@@ -87,7 +86,6 @@ limitations under the License.
             android:text="@string/send_google_fusion_tables"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_fusion_tables_url"
@@ -117,7 +115,6 @@ limitations under the License.
             android:text="@string/send_google_docs"
             style="?android:attr/textAppearanceMedium"/>
           <TextView
-            android:id="@+id/upload_result_list_item_url"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
             android:text="@string/send_google_docs_url"

MyTracks/res/menu/main.xml

@@ -14,43 +14,79 @@ 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.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:id="@+id/menu_record_track"
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+  <item
     android:icon="@drawable/ic_menu_recordtrack"
+    android:id="@+id/menu_record_track"
+    android:showAsAction="always"
     android:title="@string/menu_record_track"/>
 
-  <item android:id="@+id/menu_stop_recording"
+  <item
     android:icon="@drawable/ic_menu_stoprecording"
+    android:id="@+id/menu_stop_recording"
+    android:showAsAction="always"
     android:title="@string/menu_stop_recording"/>
 
-  <item android:id="@+id/menu_tracks"
+  <item
     android:icon="@drawable/ic_menu_tracklist"
+    android:id="@+id/menu_tracks"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_tracks"/>
 
-  <item android:id="@+id/menu_markers"
+  <item
     android:icon="@drawable/ic_menu_waypoints"
+    android:id="@+id/menu_markers"
+    android:showAsAction="ifRoom"
     android:title="@string/menu_markers"/>
 
-  <item android:id="@+id/menu_search"
+  <item
+    android:icon="@drawable/chart_settings"
+    android:id="@+id/menu_chart_settings"
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_chart_view_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: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:visible="false"/>
+
+  <item
     android:icon="@android:drawable/ic_menu_search"
+    android:id="@+id/menu_search"
     android:title="@string/menu_search"/>
 
-  <item android:id="@+id/menu_sensor_state"
+  <item
     android:icon="@drawable/ic_menu_sensorstatus"
+    android:id="@+id/menu_sensor_state"
     android:orderInCategory="1000"
     android:title="@string/menu_sensor_state"/>
 
-  <item android:id="@+id/menu_settings"
+  <item
     android:icon="@android:drawable/ic_menu_preferences"
+    android:id="@+id/menu_settings"
     android:orderInCategory="1001"
     android:title="@string/menu_settings"/>
 
-  <item android:id="@+id/menu_aggregated_statistics"
+  <item
+    android:id="@+id/menu_aggregated_statistics"
     android:orderInCategory="1002"
     android:title="@string/menu_aggregated_statistics"/>
 
-  <item android:id="@+id/menu_help"
+  <item
     android:icon="@android:drawable/ic_menu_info_details"
+    android:id="@+id/menu_help"
     android:orderInCategory="1003"
     android:title="@string/menu_help"/>
-</menu>
+
+</menu>

MyTracks/res/menu/search_only.xml

@@ -15,9 +15,12 @@ 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:id="@+id/menu_search"
+
+  <item
     android:icon="@android:drawable/ic_menu_search"
-    android:title="@string/menu_search"
+    android:id="@+id/menu_search"
     android:onClick="onSearch"
-    android:showAsAction="always" />
+    android:showAsAction="always"
+    android:title="@string/menu_search"/>
+
 </menu>

MyTracks/res/values-v11/styles.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+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.
+-->
+<resources>
+  <style name="ThemeSelector" parent="android:Theme.Holo" />
+</resources>

MyTracks/res/values/do_not_translate.xml

@@ -35,7 +35,7 @@ limitations under the License.
     http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
   </string>
   <string name="my_tracks_analytics_id">UA-7222692-2</string> 
-  <string name="my_tracks_privacy_url">m.google.com/privacy</string>
+  <string name="my_tracks_privacy_url">www.google.com/policies/privacy/</string>
   <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
   <string name="my_tracks_support_url">
     groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks

MyTracks/res/values/styles.xml

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <style name="ThemeSelector" parent="android:Theme" />
+
   <!--  About page label -->
   <style name="AboutLabel">
     <item name="android:layout_height">wrap_content</item>