aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/menu/contact_details.xml16
-rw-r--r--src/main/res/menu/editaccount.xml19
-rw-r--r--src/main/res/menu/muc_details.xml14
3 files changed, 36 insertions, 13 deletions
diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 328b46098..f60416dc6 100644
--- a/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
@@ -11,9 +11,21 @@
<item
android:id="@+id/action_share"
android:icon="?attr/icon_share"
- android:showAsAction="always"
android:orderInCategory="15"
- android:title="@string/share_uri_with" />
+ android:showAsAction="always"
+ android:title="@string/share_uri_with">
+ <menu>
+ <item
+ android:id="@+id/action_share_uri"
+ android:title="@string/share_as_uri" />
+ <item
+ android:id="@+id/action_share_http"
+ android:title="@string/share_as_http" />
+ <item
+ android:id="@+id/action_show_qr_code"
+ android:title="@string/show_qr_code" />
+ </menu>
+ </item>
<item
android:id="@+id/action_delete_contact"
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index 5541470d8..698c648ee 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -6,13 +6,17 @@
android:showAsAction="always">
<menu>
<item
+ android:id="@+id/action_share_uri"
+ android:title="@string/share_as_uri" />
+ <item
+ android:id="@+id/action_share_http"
+ android:title="@string/share_as_http" />
+ <item
android:id="@+id/action_share_barcode"
- android:title="@string/share_as_barcode"/>
+ android:title="@string/share_as_barcode" />
<item
- android:id="@+id/action_share_uri"
- android:title="@string/share_as_uri"/>
- <item android:id="@+id/action_share_http"
- android:title="@string/share_as_http"/>
+ android:id="@+id/action_show_qr_code"
+ android:title="@string/show_qr_code" />
</menu>
</item>
@@ -23,11 +27,6 @@
android:icon="@drawable/ic_new_releases_white_24dp" />
<item
- android:id="@+id/action_show_qr_code"
- android:showAsAction="never"
- android:title="@string/show_qr_code" />
-
- <item
android:id="@+id/action_show_block_list"
android:showAsAction="always"
android:icon="@drawable/ic_speaker_notes_off_white_24dp"
diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index cf0d6c3b8..585bd1def 100644
--- a/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
@@ -12,7 +12,19 @@
android:icon="?attr/icon_share"
android:showAsAction="always"
android:orderInCategory="15"
- android:title="@string/share_uri_with" />
+ android:title="@string/share_uri_with" >
+ <menu>
+ <item
+ android:id="@+id/action_share_uri"
+ android:title="@string/share_as_uri" />
+ <item
+ android:id="@+id/action_share_http"
+ android:title="@string/share_as_http" />
+ <item
+ android:id="@+id/action_show_qr_code"
+ android:title="@string/show_qr_code" />
+ </menu>
+ </item>
<item
android:id="@+id/action_save_as_bookmark"