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-xxhdpi | |
| 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-xxhdpi')
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 Binary files differnew file mode 100644 index 00000000..5dc21435 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_action_cancel.png diff --git a/src/main/res/drawable-xxhdpi/ic_action_download.png b/src/main/res/drawable-xxhdpi/ic_action_download.png Binary files differnew file mode 100644 index 00000000..6bcd8313 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_action_download.png diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png Binary files differnew file mode 100644 index 00000000..530227e2 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_action_settings.png diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png Binary files differnew file mode 100644 index 00000000..b12e040e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_add_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..b50e5161 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_attach_file_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 00000000..faa409f8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png Binary files differnew file mode 100644 index 00000000..bb39d157 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_chat_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..72b3474b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_content_copy_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png Binary files differnew file mode 100644 index 00000000..a8d8ca84 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_delete_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..21b617a9 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_edit_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png Binary files differnew file mode 100644 index 00000000..fe5bd13f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_edit_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..95502de3 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png 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 Binary files differnew file mode 100644 index 00000000..7ff60d6f --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_group_add_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png Binary files differnew file mode 100644 index 00000000..fffa6a6a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_group_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..cabd50c0 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_import_export_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png Binary files differdeleted file mode 100644 index 2c51b8b7..00000000 --- a/src/main/res/drawable-xxhdpi/ic_indicator.png +++ /dev/null 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 Binary files differnew file mode 100644 index 00000000..031eb06e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_open_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..f57082d8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_lock_outline_white_48dp.png 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 Binary files differnew file mode 100644 index 00000000..ba242487 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_person_add_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png Binary files differnew file mode 100644 index 00000000..87ab2d64 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_refresh_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..4b1003db --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_remove_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png Binary files differnew file mode 100644 index 00000000..75d9aa69 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_search_white_48dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png Binary files differnew file mode 100644 index 00000000..d47d042e --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_settings_grey600_36dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png Binary files differnew file mode 100644 index 00000000..a6e5788b --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_warning_white_36dp.png |
