Merge heads

This commit is contained in:
youtaol
2012-05-04 17:04:45 +08:00
parent a12f4bcbe8
commit fd90dcffa6
189 changed files with 3288 additions and 3323 deletions
+21 -18
View File
@@ -18,30 +18,30 @@ limitations under the License.
<item
android:icon="@drawable/menu_stop_recording"
android:id="@+id/track_detail_stop_recording"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_stop_recording"/>
<item
android:icon="@drawable/menu_insert_marker"
android:id="@+id/track_detail_insert_marker"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_insert_marker"/>
<item
android:icon="@drawable/menu_play"
android:id="@+id/track_detail_play"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_play"/>
<item
android:icon="@drawable/menu_share"
android:id="@+id/track_detail_share"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_share">
<menu>
<item
android:id="@+id/track_detail_share_map"
android:title="@string/menu_share_map"/>
android:id="@+id/track_detail_share_map_url"
android:title="@string/menu_share_map_url"/>
<item
android:id="@+id/track_detail_share_fusion_table"
android:title="@string/menu_share_fusion_table"/>
android:id="@+id/track_detail_share_fusion_table_url"
android:title="@string/menu_share_fusion_table_url"/>
<item android:id="@+id/track_detail_share_gpx"/>
<item android:id="@+id/track_detail_share_kml"/>
<item android:id="@+id/track_detail_share_csv"/>
@@ -49,13 +49,16 @@ limitations under the License.
</menu>
</item>
<item
android:icon="@drawable/ic_menu_waypoints"
android:icon="@drawable/menu_markers"
android:id="@+id/track_detail_markers"
android:showAsAction="ifRoom"
android:title="@string/menu_markers"/>
<item
android:icon="@drawable/menu_send_google"
android:id="@+id/track_detail_send_google"
android:title="@string/menu_send_google"/>
<item
android:icon="@drawable/menu_save"
android:id="@+id/track_detail_save"
android:title="@string/menu_save">
<menu>
@@ -74,21 +77,21 @@ limitations under the License.
android:id="@+id/track_detail_delete"
android:title="@string/menu_delete"/>
<item
android:icon="@android:drawable/ic_menu_mylocation"
android:id="@+id/track_detail_my_location"
android:title="@string/menu_my_location"/>
<item
android:icon="@android:drawable/ic_menu_mapmode"
android:icon="@drawable/menu_satellite_mode"
android:id="@+id/track_detail_satellite_mode"
android:title="@string/menu_satellite_mode"/>
<item
android:icon="@drawable/ic_menu_chartsettings"
android:icon="@drawable/menu_sensor_state"
android:id="@+id/track_detail_sensor_state"
android:title="@string/menu_sensor_state"/>
<item
android:icon="@drawable/menu_chart_settings"
android:id="@+id/track_detail_chart_settings"
android:title="@string/menu_chart_settings"/>
<item
android:icon="@drawable/ic_menu_sensorstatus"
android:id="@+id/track_detail_sensor_state"
android:title="@string/menu_sensor_state"/>
android:icon="@drawable/menu_stats_settings"
android:id="@+id/track_detail_stats_settings"
android:title="@string/menu_stats_settings"/>
<item
android:icon="@drawable/menu_settings"
android:id="@+id/track_detail_settings"