Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / res / menu / main_menu.xml

diff --git a/android/res/menu/main_menu.xml b/android/res/menu/main_menu.xml
index f378ed0f9fa4385ac18860520924aae29b386de5..51fc89f9e9c606cfb270b8463074f3e5df21c560 100644 (file)
--- a/android/res/menu/main_menu.xml
+++ b/android/res/menu/main_menu.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >\r
 \r
-    <item\r
-        android:id="@+id/main_menu_open"\r
-        android:title="Open"/>\r
-    <item\r
-        android:id="@+id/main_menu_motor"\r
-        android:title="Motor"/>\r
     <item\r
         android:id="@+id/main_menu_preferences"\r
         android:title="@string/Preferences"\r
-        android:icon="@drawable/ic_menu_preferences"/>\r
+        android:icon="@drawable/ic_menu_preferences"\r
+        android:showAsAction="never"/>\r
+    \r
+    <item\r
+        android:id="@+id/menu_about"\r
+        android:title="@string/About"\r
+        android:icon="@drawable/ic_menu_info_details"\r
+        android:showAsAction="never"/>\r
 \r
 </menu>
\ No newline at end of file