forked from upstream-mirrors/OpenTracks
Merge heads
This commit is contained in:
@@ -103,9 +103,14 @@ limitations under the License.
|
||||
android:id="@+id/track_detail_settings"
|
||||
android:orderInCategory="14"
|
||||
android:title="@string/menu_settings"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_feedback"
|
||||
android:id="@+id/track_detail_feedback"
|
||||
android:orderInCategory="15"
|
||||
android:title="@string/menu_feedback"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_help"
|
||||
android:id="@+id/track_detail_help"
|
||||
android:orderInCategory="15"
|
||||
android:orderInCategory="16"
|
||||
android:title="@string/menu_help"/>
|
||||
</menu>
|
||||
@@ -74,6 +74,10 @@ limitations under the License.
|
||||
android:icon="@drawable/menu_settings"
|
||||
android:id="@+id/track_list_settings"
|
||||
android:title="@string/menu_settings"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_feedback"
|
||||
android:id="@+id/track_list_feedback"
|
||||
android:title="@string/menu_feedback"/>
|
||||
<item
|
||||
android:icon="@drawable/menu_help"
|
||||
android:id="@+id/track_list_help"
|
||||
|
||||
Reference in New Issue
Block a user