From c1ee9e682a2f825e72260deb3f1c8579e21ed8de Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 4 Jul 2014 11:36:02 +0200
Subject: added action bar menu to start conversation

---
 res/menu/start_conversation.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 res/menu/start_conversation.xml

(limited to 'res/menu')

diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
new file mode 100644
index 00000000..4c59f482
--- /dev/null
+++ b/res/menu/start_conversation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:id="@+id/search"
+          android:title="@string/search"
+          android:icon="@drawable/ic_action_search"
+          android:showAsAction="collapseActionView|ifRoom"
+          android:actionViewClass="android.widget.SearchView" />
+    
+    <item android:id="@+id/create_contact"
+        	android:title="@string/create_contact"
+        	android:icon="@drawable/ic_action_add_person"
+        	android:showAsAction="ifRoom"
+        	/>
+    <item
+        android:id="@+id/action_accounts"
+        android:orderInCategory="90"
+        android:showAsAction="never"
+        android:title="@string/action_accounts"
+	/>
+        
+    <item
+        android:id="@+id/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"
+        android:title="@string/action_settings"/>
+
+</menu>
-- 
cgit v1.2.3


From 7c3f3b2a3e878b1b1cfdcca102a38efe033dc6b7 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Fri, 4 Jul 2014 14:22:17 +0200
Subject: added group add button

---
 res/menu/start_conversation.xml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 4c59f482..89ba675a 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -1,27 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:id="@+id/search"
-          android:title="@string/search"
-          android:icon="@drawable/ic_action_search"
-          android:showAsAction="collapseActionView|ifRoom"
-          android:actionViewClass="android.widget.SearchView" />
-    
-    <item android:id="@+id/create_contact"
-        	android:title="@string/create_contact"
-        	android:icon="@drawable/ic_action_add_person"
-        	android:showAsAction="ifRoom"
-        	/>
+
+    <item
+        android:id="@+id/action_search"
+        android:actionViewClass="android.widget.SearchView"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|ifRoom"
+        android:title="@string/search"/>
+    <item
+        android:id="@+id/action_create_contact"
+        android:icon="@drawable/ic_action_add_person"
+        android:showAsAction="ifRoom"
+        android:title="@string/create_contact"/>
+    <item
+        android:id="@+id/action_create_conference"
+        android:icon="@drawable/ic_action_add_group"
+        android:showAsAction="ifRoom"
+        android:title="@string/create_conference"/>
     <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"/>
 
-</menu>
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3


From 3bdf84b6a0170264a20795e7956a68421f312fa3 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 7 Jul 2014 09:32:10 +0200
Subject: filter contacts and starting confercenes

---
 res/menu/start_conversation.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 89ba675a..3daff29a 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/action_search"
-        android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/ic_action_search"
-        android:showAsAction="collapseActionView|ifRoom"
-        android:title="@string/search"/>
     <item
         android:id="@+id/action_create_contact"
         android:icon="@drawable/ic_action_add_person"
@@ -17,6 +11,12 @@
         android:icon="@drawable/ic_action_add_group"
         android:showAsAction="ifRoom"
         android:title="@string/create_conference"/>
+    <item
+        android:id="@+id/action_search"
+        android:actionViewClass="android.widget.SearchView"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|ifRoom"
+        android:title="@string/search"/>
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3


From 2684ecda1ec085621d3b0b19f7ff7dd0c3193221 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 9 Jul 2014 23:13:23 +0200
Subject: small changes

---
 res/menu/start_conversation.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/start_conversation.xml b/res/menu/start_conversation.xml
index 3daff29a..12109d7b 100644
--- a/res/menu/start_conversation.xml
+++ b/res/menu/start_conversation.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <item
+        android:id="@+id/action_search"
+        android:actionViewClass="android.widget.SearchView"
+        android:icon="@drawable/ic_action_search"
+        android:showAsAction="collapseActionView|always"
+        android:title="@string/search"/>
+    
     <item
         android:id="@+id/action_create_contact"
         android:icon="@drawable/ic_action_add_person"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:title="@string/create_contact"/>
     <item
         android:id="@+id/action_create_conference"
         android:icon="@drawable/ic_action_add_group"
-        android:showAsAction="ifRoom"
+        android:showAsAction="always"
         android:title="@string/create_conference"/>
-    <item
-        android:id="@+id/action_search"
-        android:actionViewClass="android.widget.SearchView"
-        android:icon="@drawable/ic_action_search"
-        android:showAsAction="collapseActionView|ifRoom"
-        android:title="@string/search"/>
+    
     <item
         android:id="@+id/action_accounts"
         android:orderInCategory="90"
-- 
cgit v1.2.3


From f8763015eb100568c69dfc89e8e25b4aa9b454e9 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 10 Jul 2014 01:55:19 +0200
Subject: added contextual menu for contacts

---
 res/menu/contact_context.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 res/menu/contact_context.xml

(limited to 'res/menu')

diff --git a/res/menu/contact_context.xml b/res/menu/contact_context.xml
new file mode 100644
index 00000000..11ac7d7c
--- /dev/null
+++ b/res/menu/contact_context.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/context_start_conversation"
+        android:title="@string/start_conversation"/>
+    <item
+        android:id="@+id/context_contact_details"
+        android:title="@string/view_contact_details"/>
+    <item
+        android:id="@+id/context_delete_contact"
+        android:title="@string/delete_contact"/>
+
+</menu>
\ No newline at end of file
-- 
cgit v1.2.3