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

Upgraded menu configuration.

Browse Source
This commit is contained in:
Dennis Guse
2019-07-02 20:32:03 +02:00
parent 7394e8b382
commit 539285f6cf
6 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/res/menu/list_context_menu.xml
+28 -28
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2012 Google Inc. Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,30 +13,31 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:icon="@drawable/ic_menu_share" <item
android:id="@+id/list_context_menu_share" android:icon="@drawable/ic_menu_share"
android:showAsAction="ifRoom" android:id="@+id/list_context_menu_share"
android:title="@string/menu_share"/> android:title="@string/menu_share"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_show_on_map" <item
android:id="@+id/list_context_menu_show_on_map" android:icon="@drawable/ic_menu_show_on_map"
android:showAsAction="ifRoom" android:id="@+id/list_context_menu_show_on_map"
android:title="@string/menu_show_on_map"/> android:title="@string/menu_show_on_map"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_edit" <item
android:id="@+id/list_context_menu_edit" android:icon="@drawable/ic_menu_edit"
android:showAsAction="ifRoom" android:id="@+id/list_context_menu_edit"
android:title="@string/menu_edit"/> android:title="@string/menu_edit"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_delete" <item
android:id="@+id/list_context_menu_delete" android:icon="@drawable/ic_menu_delete"
android:showAsAction="ifRoom" android:id="@+id/list_context_menu_delete"
android:title="@string/menu_delete"/> android:title="@string/menu_delete"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_select_all" <item
android:id="@+id/list_context_menu_select_all" android:icon="@drawable/ic_menu_select_all"
android:showAsAction="ifRoom" android:id="@+id/list_context_menu_select_all"
android:title="@string/menu_select_all"/> android:title="@string/menu_select_all"
app:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_detail.xml
+23 -23
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2012 Google Inc. Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,25 +13,26 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:icon="@drawable/ic_menu_show_on_map" <item
android:id="@+id/marker_detail_show_on_map" android:icon="@drawable/ic_menu_show_on_map"
android:showAsAction="ifRoom" android:id="@+id/marker_detail_show_on_map"
android:title="@string/menu_show_on_map"/> android:title="@string/menu_show_on_map"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_edit" <item
android:id="@+id/marker_detail_edit" android:icon="@drawable/ic_menu_edit"
android:showAsAction="ifRoom" android:id="@+id/marker_detail_edit"
android:title="@string/menu_edit"/> android:title="@string/menu_edit"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_delete" <item
android:id="@+id/marker_detail_delete" android:icon="@drawable/ic_menu_delete"
android:showAsAction="ifRoom" android:id="@+id/marker_detail_delete"
android:title="@string/menu_delete"/> android:title="@string/menu_delete"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_view_photo" <item
android:id="@+id/marker_detail_view_photo" android:icon="@drawable/ic_menu_view_photo"
android:showAsAction="ifRoom" android:id="@+id/marker_detail_view_photo"
android:title="@string/menu_view_photo"/> android:title="@string/menu_view_photo"
app:showAsAction="ifRoom" />
</menu> </menu>
myTracks/src/main/res/menu/marker_list.xml
+14 -14
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2012 Google Inc. Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +13,17 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:icon="@drawable/ic_menu_insert_marker" <item
android:id="@+id/marker_list_insert_marker" android:icon="@drawable/ic_menu_insert_marker"
android:showAsAction="ifRoom" android:id="@+id/marker_list_insert_marker"
android:title="@string/menu_insert_marker"/> app:showAsAction="ifRoom"
<item android:title="@string/menu_insert_marker" />
android:actionViewClass="android.widget.SearchView" <item
android:icon="@drawable/ic_menu_search" android:icon="@drawable/ic_menu_search"
android:id="@+id/marker_list_search" android:id="@+id/marker_list_search"
android:showAsAction="ifRoom|collapseActionView" android:title="@string/menu_search"
android:title="@string/menu_search"/> app:showAsAction="ifRoom|collapseActionView"
app:actionViewClass="android.widget.SearchView" />
</menu> </menu>
myTracks/src/main/res/menu/search_list.xml
+9 -9
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2012 Google Inc. Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,11 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:actionViewClass="android.widget.SearchView" <item
android:icon="@drawable/ic_menu_search" android:icon="@drawable/ic_menu_search"
android:id="@+id/search_list_search" android:id="@+id/search_list_search"
android:showAsAction="ifRoom|collapseActionView" android:title="@string/menu_search"
android:title="@string/menu_search"/> app:showAsAction="ifRoom|collapseActionView"
app:actionViewClass="android.widget.SearchView" />
</menu> </menu>
myTracks/src/main/res/menu/track_detail.xml
+56 -56
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2011 Google Inc. Copyright 2011 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,58 +13,59 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:icon="@drawable/ic_menu_insert_marker" <item
android:id="@+id/track_detail_insert_marker" android:icon="@drawable/ic_menu_insert_marker"
android:orderInCategory="1" android:id="@+id/track_detail_insert_marker"
android:showAsAction="ifRoom" android:orderInCategory="1"
android:title="@string/menu_insert_marker"/> app:showAsAction="ifRoom"
<item android:title="@string/menu_insert_marker" />
android:icon="@drawable/ic_menu_insert_photo" <item
android:id="@+id/track_detail_insert_photo" android:icon="@drawable/ic_menu_insert_photo"
android:orderInCategory="2" android:id="@+id/track_detail_insert_photo"
android:showAsAction="ifRoom" android:orderInCategory="2"
android:title="@string/menu_insert_photo"/> app:showAsAction="ifRoom"
<item android:title="@string/menu_insert_photo" />
android:icon="@drawable/ic_menu_share" <item
android:id="@+id/track_detail_share" android:icon="@drawable/ic_menu_share"
android:orderInCategory="4" android:id="@+id/track_detail_share"
android:showAsAction="ifRoom" android:orderInCategory="4"
android:title="@string/menu_share"/> app:showAsAction="ifRoom"
<item android:title="@string/menu_share" />
android:icon="@drawable/ic_menu_markers" <item
android:id="@+id/track_detail_markers" android:icon="@drawable/ic_menu_markers"
android:orderInCategory="5" android:id="@+id/track_detail_markers"
android:title="@string/menu_markers"/> android:orderInCategory="5"
<item android:title="@string/menu_markers" />
android:icon="@drawable/ic_menu_edit" <item
android:id="@+id/track_detail_edit" android:icon="@drawable/ic_menu_edit"
android:orderInCategory="9" android:id="@+id/track_detail_edit"
android:title="@string/menu_edit"/> android:orderInCategory="9"
<item android:title="@string/menu_edit" />
android:icon="@drawable/ic_menu_delete" <item
android:id="@+id/track_detail_delete" android:icon="@drawable/ic_menu_delete"
android:orderInCategory="10" android:id="@+id/track_detail_delete"
android:title="@string/menu_delete"/> android:orderInCategory="10"
<item android:title="@string/menu_delete" />
android:icon="@drawable/ic_menu_voice_frequency" <item
android:id="@+id/track_detail_voice_frequency" android:icon="@drawable/ic_menu_voice_frequency"
android:orderInCategory="11" android:id="@+id/track_detail_voice_frequency"
android:title="@string/menu_voice_frequency"/> android:orderInCategory="11"
<item android:title="@string/menu_voice_frequency" />
android:icon="@drawable/ic_menu_split_frequency" <item
android:id="@+id/track_detail_split_frequency" android:icon="@drawable/ic_menu_split_frequency"
android:orderInCategory="12" android:id="@+id/track_detail_split_frequency"
android:title="@string/menu_split_frequency"/> android:orderInCategory="12"
<item android:title="@string/menu_split_frequency" />
android:icon="@drawable/ic_menu_sensor_state" <item
android:id="@+id/track_detail_sensor_state" android:icon="@drawable/ic_menu_sensor_state"
android:orderInCategory="13" android:id="@+id/track_detail_sensor_state"
android:title="@string/menu_sensor_state"/> android:orderInCategory="13"
<item android:title="@string/menu_sensor_state" />
android:icon="@drawable/ic_menu_settings" <item
android:id="@+id/track_detail_settings" android:icon="@drawable/ic_menu_settings"
android:orderInCategory="14" android:id="@+id/track_detail_settings"
android:title="@string/menu_settings"/> android:orderInCategory="14"
android:title="@string/menu_settings" />
</menu> </menu>
myTracks/src/main/res/menu/track_list.xml
+34 -34
View File
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?><!--
<!--
Copyright 2012 Google Inc. Copyright 2012 Google Inc.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,36 +13,37 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:app="http://schemas.android.com/apk/res-auto"
<item xmlns:android="http://schemas.android.com/apk/res/android">
android:actionViewClass="android.widget.SearchView" <item
android:icon="@drawable/ic_menu_search" android:icon="@drawable/ic_menu_search"
android:id="@+id/track_list_search" android:id="@+id/track_list_search"
android:showAsAction="ifRoom|collapseActionView" android:title="@string/menu_search"
android:title="@string/menu_search"/> app:actionViewClass="android.widget.SearchView"
<item app:showAsAction="ifRoom|collapseActionView" />
android:icon="@drawable/ic_menu_start_gps" <item
android:id="@+id/track_list_start_gps" android:icon="@drawable/ic_menu_start_gps"
android:showAsAction="ifRoom" android:id="@+id/track_list_start_gps"
android:title="@string/menu_start_gps"/> android:title="@string/menu_start_gps"
<item app:showAsAction="ifRoom" />
android:icon="@drawable/ic_menu_aggregated_statistics" <item
android:id="@+id/track_list_aggregated_statistics" android:icon="@drawable/ic_menu_aggregated_statistics"
android:title="@string/menu_aggregated_statistics"/> android:id="@+id/track_list_aggregated_statistics"
<item android:title="@string/menu_aggregated_statistics" />
android:icon="@drawable/ic_menu_export" <item
android:id="@+id/track_list_export_all" android:icon="@drawable/ic_menu_export"
android:title="@string/menu_export_all"/> android:id="@+id/track_list_export_all"
<item android:title="@string/menu_export_all" />
android:icon="@drawable/ic_menu_import" <item
android:id="@+id/track_list_import_all" android:icon="@drawable/ic_menu_import"
android:title="@string/menu_import_all"/> android:id="@+id/track_list_import_all"
<item android:title="@string/menu_import_all" />
android:icon="@drawable/ic_menu_delete" <item
android:id="@+id/track_list_delete_all" android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete_all"/> android:id="@+id/track_list_delete_all"
<item android:title="@string/menu_delete_all" />
android:icon="@drawable/ic_menu_settings" <item
android:id="@+id/track_list_settings" android:icon="@drawable/ic_menu_settings"
android:title="@string/menu_settings"/> android:id="@+id/track_list_settings"
android:title="@string/menu_settings" />
</menu> </menu>