aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/drawable-xxhdpi
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
committersteckbrief <steckbrief@chefmail.de>2015-02-20 22:19:31 +0100
commit20eae3955700341188bc1907a506970f5817a153 (patch)
tree6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/drawable-xxhdpi
parent980a84a6ce4358e8662addf203695e01d9f931dc (diff)
parentecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff)
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
Diffstat (limited to 'src/main/res/drawable-xxhdpi')
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_cancel.pngbin0 -> 574 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_download.pngbin0 -> 574 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_action_settings.pngbin0 -> 1863 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_add_white_48dp.pngbin0 -> 356 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.pngbin0 -> 1642 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.pngbin0 -> 893 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_chat_white_48dp.pngbin0 -> 717 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.pngbin0 -> 631 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_delete_white_48dp.pngbin0 -> 574 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.pngbin0 -> 656 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_edit_white_48dp.pngbin0 -> 843 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.pngbin0 -> 351 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.pngbin0 -> 1406 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_group_white_48dp.pngbin0 -> 1273 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.pngbin0 -> 768 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_indicator.pngbin1298 -> 0 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.pngbin0 -> 1438 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.pngbin0 -> 1437 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.pngbin0 -> 1346 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.pngbin0 -> 1704 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.pngbin0 -> 278 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_search_white_48dp.pngbin0 -> 1671 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.pngbin0 -> 1486 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_warning_white_36dp.pngbin0 -> 1050 bytes
24 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable-xxhdpi/ic_action_cancel.png b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
new file mode 100644
index 00000000..5dc21435
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_cancel.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png
new file mode 100644
index 00000000..6bcd8313
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_download.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png
new file mode 100644
index 00000000..530227e2
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_action_settings.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
new file mode 100644
index 00000000..b12e040e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
new file mode 100644
index 00000000..b50e5161
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
new file mode 100644
index 00000000..faa409f8
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
new file mode 100644
index 00000000..bb39d157
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
new file mode 100644
index 00000000..72b3474b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
new file mode 100644
index 00000000..a8d8ca84
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
new file mode 100644
index 00000000..21b617a9
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
new file mode 100644
index 00000000..fe5bd13f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
new file mode 100644
index 00000000..95502de3
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
new file mode 100644
index 00000000..7ff60d6f
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
new file mode 100644
index 00000000..fffa6a6a
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
new file mode 100644
index 00000000..cabd50c0
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
deleted file mode 100644
index 2c51b8b7..00000000
--- a/src/main/res/drawable-xxhdpi/ic_indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
new file mode 100644
index 00000000..031eb06e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
new file mode 100644
index 00000000..f57082d8
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
new file mode 100644
index 00000000..ba242487
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
new file mode 100644
index 00000000..87ab2d64
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
new file mode 100644
index 00000000..4b1003db
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
new file mode 100644
index 00000000..75d9aa69
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
new file mode 100644
index 00000000..d47d042e
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
new file mode 100644
index 00000000..a6e5788b
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png
Binary files differ