Merge master-origin

Conflicts:
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
	src/main/java/eu/siacs/conversations/ui/XmppActivity.java
	src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
	src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
	src/main/java/eu/siacs/conversations/utils/UIHelper.java
	src/main/res/values-de/strings.xml

24 files changed, 0 insertions, 0 deletions

diff --git a/src/main/res/drawable-hdpi/ic_action_cancel.png b/src/main/res/drawable-hdpi/ic_action_cancel.png
new file mode 100644
index 00000000..e206f296
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_cancel.png
diff --git a/src/main/res/drawable-hdpi/ic_action_download.png b/src/main/res/drawable-hdpi/ic_action_download.png
new file mode 100644
index 00000000..9fc6455a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_download.png
diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png
new file mode 100644
index 00000000..0eb78f7c
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_action_settings.png
diff --git a/src/main/res/drawable-hdpi/ic_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..72cedcad
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..7256ca3d
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..794b7b78
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..71cac75a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..bd2c60b8
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..0e95e9b1
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_delete_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..f8970cb2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..34ec7092
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_edit_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..46aeab45
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png
diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..a5ad0a29
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_group_white_48dp.png b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..a6ed594f
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_group_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..c3497037
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png
deleted file mode 100644
index 6de8969f..00000000
--- a/src/main/res/drawable-hdpi/ic_indicator.png
+++ /dev/null
diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..b90a5980
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..d0c25290
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..074db2d3
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..72128fe6
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..aeb1cea9
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_search_white_48dp.png b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..0bbeab15
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_search_white_48dp.png
diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..cff84744
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png
diff --git a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..c8b7140a
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_warning_white_36dp.png