Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / res / menu / option_menu.xml

diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index feb5668ea0e42c58f664735cab1b30f8783b1ec7..3bd5a54e2bb4b6d6dd0abcb81f5fb39d94e7954e 100644 (file)
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -17,10 +17,16 @@
     <item android:id="@+id/connect_scan"
           android:icon="@android:drawable/ic_menu_search"
           android:title="@string/connect_device" />
-    <item android:id="@+id/telemetry_service_control"
-          android:icon="@android:drawable/ic_menu_manage"
-          android:title="@string/telemetry_service_control" />
-    <item android:id="@+id/telemetry_service_bind"
-          android:icon="@android:drawable/ic_menu_rotate"
-          android:title="@string/telemetry_service_bind" />
+    <item android:id="@+id/quit"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/quit" />
+    <item android:id="@+id/select_freq"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/select_freq" />
+    <item android:id="@+id/select_rate"
+          android:icon="@android:drawable/ic_menu_preferences"
+          android:title="@string/select_rate" />
+    <item android:id="@+id/change_units"
+         android:icon="@android:drawable/ic_menu_view"
+         android:title="@string/change_units" />
 </menu>