From 87a048fe6f88739a381cecab973e1af12325ce16 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 7 Mar 2015 14:15:38 +0100
Subject: display geo uris as location. show 'send loction' in share menu if
 request location intent can be resolved

---
 src/main/res/menu/attachment_choices.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/main/res/menu')

diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 5139272c..6e8fc51d 100644
--- a/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
@@ -2,14 +2,21 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/attach_choose_picture"
-        android:title="@string/attach_choose_picture"/>
+        android:id="@+id/attach_location"
+        android:title="@string/send_location"/>
+
+    <item
+        android:id="@+id/attach_record_voice"
+        android:title="@string/attach_record_voice"/>
+
     <item
         android:id="@+id/attach_take_picture"
         android:title="@string/attach_take_picture"/>
-	<item
-		android:id="@+id/attach_record_voice"
-		android:title="@string/attach_record_voice"/>
+
+    <item
+        android:id="@+id/attach_choose_picture"
+        android:title="@string/attach_choose_picture"/>
+
     <item
         android:id="@+id/attach_choose_file"
         android:title="@string/choose_file"/>
-- 
cgit v1.2.3


From f76baa5658df9b08c7cdc7b3b85560842cb4d7f9 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Tue, 17 Mar 2015 15:00:50 +0100
Subject: Added multiple select to Choose Contact Activity

When passing the Choose Contact Activity a boolean called "multiple"
set to true, it now allows the user to select multiple contacts. Long
pressing a contact enters multiple selection mode and the selection is
confirmed using a button in the CAB. The Activity returns whether or not
multiple contacts were selected using the same boolean. If multiple
contacts were selected, an array of JID strings called "contacts" is
returned. The Choose Contact Activity now also honors "filter_contacts",
an array of strings containing JIDs that should not be displayed in
the picker.

The invite to conference dialog now uses this feature to enable inviting
multiple contacts at once. Additionally, Invite Contact uses
"filter_contacts" to only display contacts that are not yet
participating in the conversation
---
 src/main/res/menu/select_multiple.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/main/res/menu/select_multiple.xml

(limited to 'src/main/res/menu')

diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml
new file mode 100644
index 00000000..4240849f
--- /dev/null
+++ b/src/main/res/menu/select_multiple.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/selection_submit"
+        android:title="@string/invite_contact"
+        android:showAsAction="always" />
+
+</menu>
-- 
cgit v1.2.3