diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/drawable-xxxhdpi | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (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-xxxhdpi')
23 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..cd32f0a8 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png Binary files differnew file mode 100644 index 00000000..55464b7e --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..b9b6c0b3 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..68f14af6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_chat_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..435c087a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..47fef5aa --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..1361eedc --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..73680649 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_edit_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 00000000..a57e72f7 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_file_download_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..7e9d67f6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..2a27316b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_group_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png Binary files differnew file mode 100644 index 00000000..ea80bc00 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_launcher.png b/src/main/res/drawable-xxxhdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..b6dcb0b9 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png Binary files differnew file mode 100644 index 00000000..f7652e60 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_open_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png Binary files differnew file mode 100644 index 00000000..440070a1 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_lock_outline_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notification.png b/src/main/res/drawable-xxxhdpi/ic_notification.png Binary files differnew file mode 100644 index 00000000..ee2f3a43 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notification.png diff --git a/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..89c1aef2 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png Binary files differnew file mode 100644 index 00000000..86db9890 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_received_indicator.png diff --git a/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..fe0ae13a --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..524cc0a0 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..7caf6c9b --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..8fea47f6 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..abc5c7a5 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_warning_white_36dp.png |
