From d458919c8f3e9ff968ed2df3b3492a07794aa477 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 3 Nov 2014 22:47:07 +0100
Subject: unfinishd qr code implemenation. thanks to @emdete

---
 src/main/res/menu/start_conversation.xml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/main/res/menu/start_conversation.xml')

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
-- 
cgit v1.2.3