upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-11 13:33:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge heads

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/menu/marker_list_context_menu.xml → MyTracks/res/menu/list_context_menu.xml
+6 -6
View File
@@ -17,17 +17,17 @@ limitations under the License.
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:icon="@drawable/menu_show_on_map"
android:id="@+id/marker_list_context_menu_show_on_map"
android:showAsAction="always"
android:id="@+id/list_context_menu_show_on_map"
android:showAsAction="ifRoom"
android:title="@string/menu_show_on_map"/>
<item
android:icon="@drawable/menu_edit"
android:id="@+id/marker_list_context_menu_edit"
android:showAsAction="always"
android:id="@+id/list_context_menu_edit"
android:showAsAction="ifRoom"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/menu_delete"
android:id="@+id/marker_list_context_menu_delete"
android:showAsAction="always"
android:id="@+id/list_context_menu_delete"
android:showAsAction="ifRoom"
android:title="@string/menu_delete"/>
</menu>
MyTracks/res/menu/marker_detail.xml
+2 -2
View File
@@ -18,12 +18,12 @@ limitations under the License.
<item
android:icon="@drawable/menu_show_on_map"
android:id="@+id/marker_detail_show_on_map"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_show_on_map"/>
<item
android:icon="@drawable/menu_edit"
android:id="@+id/marker_detail_edit"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/menu_delete"
MyTracks/res/menu/marker_list.xml
+1 -1
View File
@@ -18,7 +18,7 @@ limitations under the License.
<item
android:icon="@drawable/menu_insert_marker"
android:id="@+id/marker_list_insert_marker"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_insert_marker"/>
<item
android:actionViewClass="android.widget.SearchView"
MyTracks/res/menu/track_list_context_menu.xml → MyTracks/res/menu/search_list.xml
+5 -9
View File
@@ -16,13 +16,9 @@ limitations under the License.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:icon="@drawable/menu_edit"
android:id="@+id/track_list_context_menu_edit"
android:showAsAction="always"
android:title="@string/menu_edit"/>
<item
android:icon="@drawable/menu_delete"
android:id="@+id/track_list_context_menu_delete"
android:showAsAction="always"
android:title="@string/menu_delete"/>
android:actionViewClass="android.widget.SearchView"
android:icon="@drawable/menu_search"
android:id="@+id/search_list_search"
android:showAsAction="always|collapseActionView"
android:title="@string/menu_search"/>
</menu>
MyTracks/res/menu/track_detail.xml
+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"
MyTracks/res/menu/track_list.xml
+14 -10
View File
@@ -18,12 +18,12 @@ limitations under the License.
<item
android:icon="@drawable/menu_record_track"
android:id="@+id/track_list_record_track"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_record_track"/>
<item
android:icon="@drawable/menu_stop_recording"
android:id="@+id/track_list_stop_recording"
android:showAsAction="always"
android:showAsAction="ifRoom"
android:title="@string/menu_stop_recording"/>
<item
android:actionViewClass="android.widget.SearchView"
@@ -32,22 +32,26 @@ limitations under the License.
android:showAsAction="always|collapseActionView"
android:title="@string/menu_search"/>
<item
android:id="@+id/track_list_import_all"
android:title="@string/menu_import_all"/>
android:icon="@drawable/menu_import"
android:id="@+id/track_list_import"
android:title="@string/menu_import"/>
<item
android:id="@+id/track_list_export_all"
android:title="@string/menu_export_all">
android:icon="@drawable/menu_save_all"
android:id="@+id/track_list_save_all"
android:title="@string/menu_save_all">
<menu>
<item android:id="@+id/track_list_export_gpx"/>
<item android:id="@+id/track_list_export_kml"/>
<item android:id="@+id/track_list_export_csv"/>
<item android:id="@+id/track_list_export_tcx"/>
<item android:id="@+id/track_list_save_all_gpx"/>
<item android:id="@+id/track_list_save_all_kml"/>
<item android:id="@+id/track_list_save_all_csv"/>
<item android:id="@+id/track_list_save_all_tcx"/>
</menu>
</item>
<item
android:icon="@drawable/menu_delete_all"
android:id="@+id/track_list_delete_all"
android:title="@string/menu_delete_all"/>
<item
android:icon="@drawable/menu_aggregated_statistics"
android:id="@+id/track_list_aggregated_statistics"
android:title="@string/menu_aggregated_statistics"/>
<item