diff options
| author | Keith Packard <keithp@keithp.com> | 2012-08-07 11:48:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-08-07 11:48:20 -0700 |
| commit | 4d4ad34aec0c75c66162b992f1e52947e4685730 (patch) | |
| tree | ab7a29204eea195db77aa302fbe3e2012ef5049e /altosdroid/res/menu | |
| parent | c7f228503870c44dfd278ede8b0980dbac73d3c7 (diff) | |
| parent | 8e4ebd1f6eb928b5cb7bcda4ed88851aa9e61bdf (diff) | |
Merge remote-tracking branch 'mjb/master'
Diffstat (limited to 'altosdroid/res/menu')
| -rw-r--r-- | altosdroid/res/menu/option_menu.xml | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/altosdroid/res/menu/option_menu.xml b/altosdroid/res/menu/option_menu.xml index 27625e9c..feb5668e 100644 --- a/altosdroid/res/menu/option_menu.xml +++ b/altosdroid/res/menu/option_menu.xml @@ -14,19 +14,13 @@ limitations under the License. --> <menu xmlns:android="http://schemas.android.com/apk/res/android"> + <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/secure_connect_scan" - android:icon="@android:drawable/ic_menu_search" - android:title="@string/secure_connect" /> - <item android:id="@+id/insecure_connect_scan" - android:icon="@android:drawable/ic_menu_search" - android:title="@string/insecure_connect" /> - <item android:id="@+id/discoverable" - android:icon="@android:drawable/ic_menu_mylocation" - android:title="@string/discoverable" /> </menu> |