diff options
| author | lookshe <github@lookshe.org> | 2015-08-11 20:30:11 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2015-08-11 20:30:11 +0200 |
| commit | 639babfdb5289a035e0a22bf607c068caefa5c99 (patch) | |
| tree | 6a11aa6a189f3a5988d5d1e1c733d2027bc3494f /src/main/res/drawable-hdpi | |
| parent | 1b5966ae3b1108c88a810d7d32a0aefa8812d11f (diff) | |
| parent | 8fd688ca96005152be754eeba1be72c7c0aab9ad (diff) | |
Merge branch 'trz/rebase' into trz/rename
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java
src/main/java/de/thedevstack/conversationsplus/entities/Account.java
src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java
src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java
src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java
src/main/java/de/thedevstack/conversationsplus/entities/Message.java
src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java
src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java
src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java
src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java
src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java
src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java
src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java
src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java
src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java
src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java
src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java
src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
src/main/java/eu/siacs/conversations/crypto/OtrService.java
src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java
src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java
src/main/java/eu/siacs/conversations/http/HttpConnection.java
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
src/main/res/layout/activity_about.xml
Diffstat (limited to 'src/main/res/drawable-hdpi')
65 files changed, 0 insertions, 0 deletions
diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png Binary files differdeleted file mode 100644 index 505cbe63..00000000 --- a/src/main/res/drawable-hdpi/ic_action_send_now_away.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png Binary files differdeleted file mode 100644 index a376524d..00000000 --- a/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png Binary files differdeleted file mode 100644 index d4d2d510..00000000 --- a/src/main/res/drawable-hdpi/ic_action_send_now_offline.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png Binary files differdeleted file mode 100644 index 48676f7b..00000000 --- a/src/main/res/drawable-hdpi/ic_action_send_now_online.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 00000000..481643ec --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_add_white_24dp.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 Binary files differdeleted file mode 100644 index 72cedcad..00000000 --- a/src/main/res/drawable-hdpi/ic_add_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png b/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.png Binary files differnew file mode 100644 index 00000000..66299b88 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_attach_file_white_24dp.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 Binary files differdeleted file mode 100644 index 7256ca3d..00000000 --- a/src/main/res/drawable-hdpi/ic_attach_file_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png b/src/main/res/drawable-hdpi/ic_chat_white_48dp.png Binary files differdeleted file mode 100644 index 71cac75a..00000000 --- a/src/main/res/drawable-hdpi/ic_chat_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.png Binary files differnew file mode 100644 index 00000000..5592d5c8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_content_copy_grey600_24dp.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 Binary files differdeleted file mode 100644 index bd2c60b8..00000000 --- a/src/main/res/drawable-hdpi/ic_content_copy_grey600_36dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png Binary files differnew file mode 100644 index 00000000..b72a9f3c --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/src/main/res/drawable-hdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 00000000..a9eac0ca --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_delete_white_24dp.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 Binary files differdeleted file mode 100644 index 0e95e9b1..00000000 --- a/src/main/res/drawable-hdpi/ic_delete_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.png Binary files differnew file mode 100644 index 00000000..b5f88c80 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_edit_grey600_24dp.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 Binary files differdeleted file mode 100644 index f8970cb2..00000000 --- a/src/main/res/drawable-hdpi/ic_edit_grey600_36dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_edit_white_24dp.png b/src/main/res/drawable-hdpi/ic_edit_white_24dp.png Binary files differnew file mode 100644 index 00000000..730416c9 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_edit_white_24dp.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 Binary files differdeleted file mode 100644 index 34ec7092..00000000 --- a/src/main/res/drawable-hdpi/ic_edit_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_group_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_group_add_white_24dp.png Binary files differnew file mode 100644 index 00000000..d96c584c --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_group_add_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 Binary files differdeleted file mode 100644 index a5ad0a29..00000000 --- a/src/main/res/drawable-hdpi/ic_group_add_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_group_white_24dp.png b/src/main/res/drawable-hdpi/ic_group_white_24dp.png Binary files differnew file mode 100644 index 00000000..dada448f --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_group_white_24dp.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 Binary files differdeleted file mode 100644 index a6ed594f..00000000 --- a/src/main/res/drawable-hdpi/ic_group_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png b/src/main/res/drawable-hdpi/ic_import_export_white_24dp.png Binary files differnew file mode 100644 index 00000000..705a4cc7 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_import_export_white_24dp.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 Binary files differdeleted file mode 100644 index c3497037..00000000 --- a/src/main/res/drawable-hdpi/ic_import_export_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex bffc1c65..25fc8591 100644 --- a/src/main/res/drawable-hdpi/ic_launcher.png +++ b/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png b/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png Binary files differnew file mode 100644 index 00000000..1f582254 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_open_white_24dp.png 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 Binary files differdeleted file mode 100644 index b90a5980..00000000 --- a/src/main/res/drawable-hdpi/ic_lock_open_white_48dp.png +++ /dev/null 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 Binary files differdeleted file mode 100644 index d0c25290..00000000 --- a/src/main/res/drawable-hdpi/ic_lock_outline_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_lock_white_24dp.png b/src/main/res/drawable-hdpi/ic_lock_white_24dp.png Binary files differnew file mode 100644 index 00000000..b94735ec --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_lock_white_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png Binary files differindex c466a7b1..31c0ee1a 100644 --- a/src/main/res/drawable-hdpi/ic_notification.png +++ b/src/main/res/drawable-hdpi/ic_notification.png diff --git a/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_person_add_white_24dp.png Binary files differnew file mode 100644 index 00000000..53341908 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_person_add_white_24dp.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 Binary files differdeleted file mode 100644 index 074db2d3..00000000 --- a/src/main/res/drawable-hdpi/ic_person_add_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png Binary files differindex b1e3f274..4d2eab56 100644 --- a/src/main/res/drawable-hdpi/ic_received_indicator.png +++ b/src/main/res/drawable-hdpi/ic_received_indicator.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 Binary files differdeleted file mode 100644 index 72128fe6..00000000 --- a/src/main/res/drawable-hdpi/ic_refresh_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png b/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png Binary files differdeleted file mode 100644 index aeb1cea9..00000000 --- a/src/main/res/drawable-hdpi/ic_remove_grey600_36dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/src/main/res/drawable-hdpi/ic_search_white_24dp.png Binary files differnew file mode 100644 index 00000000..a2fc5b2e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_search_white_24dp.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 Binary files differdeleted file mode 100644 index 0bbeab15..00000000 --- a/src/main/res/drawable-hdpi/ic_search_white_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_away.png b/src/main/res/drawable-hdpi/ic_send_cancel_away.png Binary files differnew file mode 100644 index 00000000..9525c040 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_cancel_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png Binary files differnew file mode 100644 index 00000000..83a7b94b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_cancel_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_offline.png b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png Binary files differnew file mode 100644 index 00000000..2cb4f4f3 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_cancel_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_cancel_online.png b/src/main/res/drawable-hdpi/ic_send_cancel_online.png Binary files differnew file mode 100644 index 00000000..cb3bc3b5 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_cancel_online.png diff --git a/src/main/res/drawable-hdpi/ic_send_location_away.png b/src/main/res/drawable-hdpi/ic_send_location_away.png Binary files differnew file mode 100644 index 00000000..d139818b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_location_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_location_dnd.png b/src/main/res/drawable-hdpi/ic_send_location_dnd.png Binary files differnew file mode 100644 index 00000000..a9c51317 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_location_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_location_offline.png b/src/main/res/drawable-hdpi/ic_send_location_offline.png Binary files differnew file mode 100644 index 00000000..4aec18af --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_location_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_location_online.png b/src/main/res/drawable-hdpi/ic_send_location_online.png Binary files differnew file mode 100644 index 00000000..19ddc51e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_location_online.png diff --git a/src/main/res/drawable-hdpi/ic_send_photo_away.png b/src/main/res/drawable-hdpi/ic_send_photo_away.png Binary files differnew file mode 100644 index 00000000..f6beb23c --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_photo_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_photo_dnd.png b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png Binary files differnew file mode 100644 index 00000000..15b1eb7a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_photo_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_photo_offline.png b/src/main/res/drawable-hdpi/ic_send_photo_offline.png Binary files differnew file mode 100644 index 00000000..046f989b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_photo_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_photo_online.png b/src/main/res/drawable-hdpi/ic_send_photo_online.png Binary files differnew file mode 100644 index 00000000..3fd20d10 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_photo_online.png diff --git a/src/main/res/drawable-hdpi/ic_send_picture_away.png b/src/main/res/drawable-hdpi/ic_send_picture_away.png Binary files differnew file mode 100644 index 00000000..09d1c7b7 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_picture_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_picture_dnd.png b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png Binary files differnew file mode 100644 index 00000000..77964b5b --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_picture_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_picture_offline.png b/src/main/res/drawable-hdpi/ic_send_picture_offline.png Binary files differnew file mode 100644 index 00000000..28135e25 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_picture_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_picture_online.png b/src/main/res/drawable-hdpi/ic_send_picture_online.png Binary files differnew file mode 100644 index 00000000..feb926c6 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_picture_online.png diff --git a/src/main/res/drawable-hdpi/ic_send_text_away.png b/src/main/res/drawable-hdpi/ic_send_text_away.png Binary files differnew file mode 100644 index 00000000..d9ef99c5 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_text_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_text_dnd.png b/src/main/res/drawable-hdpi/ic_send_text_dnd.png Binary files differnew file mode 100644 index 00000000..b43428de --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_text_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_text_offline.png b/src/main/res/drawable-hdpi/ic_send_text_offline.png Binary files differnew file mode 100644 index 00000000..0f23fdbb --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_text_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_text_online.png b/src/main/res/drawable-hdpi/ic_send_text_online.png Binary files differnew file mode 100644 index 00000000..305f1ec2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_text_online.png diff --git a/src/main/res/drawable-hdpi/ic_send_voice_away.png b/src/main/res/drawable-hdpi/ic_send_voice_away.png Binary files differnew file mode 100644 index 00000000..e87d9751 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_voice_away.png diff --git a/src/main/res/drawable-hdpi/ic_send_voice_dnd.png b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png Binary files differnew file mode 100644 index 00000000..26a89e8e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_voice_dnd.png diff --git a/src/main/res/drawable-hdpi/ic_send_voice_offline.png b/src/main/res/drawable-hdpi/ic_send_voice_offline.png Binary files differnew file mode 100644 index 00000000..68ce48b8 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_voice_offline.png diff --git a/src/main/res/drawable-hdpi/ic_send_voice_online.png b/src/main/res/drawable-hdpi/ic_send_voice_online.png Binary files differnew file mode 100644 index 00000000..bfd7dfa7 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_send_voice_online.png diff --git a/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.png Binary files differnew file mode 100644 index 00000000..20d2b66e --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_settings_grey600_24dp.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 Binary files differdeleted file mode 100644 index cff84744..00000000 --- a/src/main/res/drawable-hdpi/ic_settings_grey600_36dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_warning_white_24dp.png b/src/main/res/drawable-hdpi/ic_warning_white_24dp.png Binary files differnew file mode 100644 index 00000000..30eee6c4 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_warning_white_24dp.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 Binary files differdeleted file mode 100644 index c8b7140a..00000000 --- a/src/main/res/drawable-hdpi/ic_warning_white_36dp.png +++ /dev/null |
