summaryrefslogtreecommitdiff
path: root/altosdroid/res
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
committerBdale Garbee <bdale@gag.com>2015-02-22 14:55:40 -0700
commit4af4e36cda96d053458eeb040e35886890917385 (patch)
tree2b1b870b5b15af2fea0297b8cc9a5dff73d265df /altosdroid/res
parent91b1a80650a7dcd7c5bf819618a8cea0fceb37d9 (diff)
parent106b16b4d5d024543d7ad8c4b4762151e253f3c4 (diff)
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'altosdroid/res')
-rw-r--r--altosdroid/res/menu/option_menu.xml3
-rw-r--r--altosdroid/res/values/strings.xml1
2 files changed, 4 insertions, 0 deletions
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml
index 3bd5a54e..f005e881 100644
--- a/altosdroid/res/menu/option_menu.xml
+++ b/altosdroid/res/menu/option_menu.xml
@@ -17,6 +17,9 @@
<item android:id="@+id/connect_scan"
android:icon="@android:drawable/ic_menu_search"
android:title="@string/connect_device" />
+ <item android:id="@+id/disconnect"
+ android:icon="@android:drawable/ic_notification_clear_all"
+ android:title="@string/disconnect_device" />
<item android:id="@+id/quit"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
android:title="@string/quit" />
diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml
index 0cc99349..8a5b29b4 100644
--- a/altosdroid/res/values/strings.xml
+++ b/altosdroid/res/values/strings.xml
@@ -27,6 +27,7 @@
<!-- Options Menu -->
<string name="connect_device">Connect a device</string>
+ <string name="disconnect_device">Disconnect device</string>
<string name="quit">Quit</string>
<string name="select_freq">Select radio frequency</string>
<string name="select_rate">Select data rate</string>