diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/menu/editaccount.xml | 8 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation.xml | 16 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 3 |
3 files changed, 20 insertions, 7 deletions
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml new file mode 100644 index 00000000..2301caf0 --- /dev/null +++ b/src/main/res/menu/editaccount.xml @@ -0,0 +1,8 @@ +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + + <item + android:id="@+id/action_show_qr_code" + android:title="@string/show_qr_code" + android:showAsAction="never" /> + +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index f7230169..2c23af59 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -1,31 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" android:icon="@drawable/ic_action_search" android:showAsAction="collapseActionView|always" - android:title="@string/search"/> + android:title="@string/search" /> <item android:id="@+id/action_create_contact" android:icon="@drawable/ic_action_add_person" android:showAsAction="always" - android:title="@string/create_contact"/> + android:title="@string/create_contact" /> <item android:id="@+id/action_join_conference" android:icon="@drawable/ic_action_add_group" android:showAsAction="always" - android:title="@string/join_conference"/> + android:title="@string/join_conference" /> + <item + android:id="@+id/action_scan_qr_code" + android:showAsAction="never" + android:title="@string/scan_qr_code" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" - android:title="@string/action_accounts"/> + android:title="@string/action_accounts" /> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" - android:title="@string/action_settings"/> + android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e941ed6d..f8e4eef2 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -282,5 +282,6 @@ <string name="url_copied_to_clipboard">URL copied to clipboard</string> <string name="message_copied_to_clipboard">Message copied to clipboard</string> <string name="image_transmission_failed">Image transmission failed</string> - + <string name="scan_qr_code">Scan QR code</string> + <string name="show_qr_code">Show QR code</string> </resources>
\ No newline at end of file |