karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-04-02 14:49:12 -07:00
parent 0bd4461c32
commit 2d05ff98ca
75 changed files with 783 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/res/menu/main.xml
+8 -25
View File
@@ -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
+1 -1
View File
@@ -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"/>