Merge branch 'development' of https://github.com/vectorijk/open-keychain into vectorijk-development

Browse Source

...

This commit is contained in:

Dominik Schürmann

2015-03-03 23:46:20 +01:00

parent c00a1f1ec3 57dca38374

commit 1cc860d23f

249 changed files with 71 additions and 44 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 641 B After Width:  |  Height:  |  Size: 669 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 679 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 450 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_collection.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 422 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_copy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 454 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.3 KiB

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_download.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 398 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_edit.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 884 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_help.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_not_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 373 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_paste.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 458 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 573 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_play.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 497 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 398 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 702 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 394 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 507 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_settings.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 953 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 647 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_upload.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 356 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 309 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_close_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 329 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_cloud_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 416 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_content_copy_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 287 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_content_paste_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 325 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_done_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 326 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_file_download_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 276 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_file_upload_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 262 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_folder_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 227 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_generic_man.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_help_grey600_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 655 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_import_export_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 300 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_lock_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 409 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_lock_open_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 408 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 351 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_person_add_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 394 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_person_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 381 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_play_arrow_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_save_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 344 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_search_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 522 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_select_all_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 314 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_settings_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 572 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_share_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 513 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_view_list_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 209 B

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_warning_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 443 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 506 B After Width:  |  Height:  |  Size: 499 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 513 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 335 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_collection.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 336 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_copy.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 288 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 333 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.2 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_download.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 324 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_edit.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 587 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_help.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 404 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 410 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_not_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 321 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_paste.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 348 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 468 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_play.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 375 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 359 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 2.3 KiB

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 317 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 292 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_settings.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 594 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 472 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_upload.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 291 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 245 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_close_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 269 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_cloud_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 307 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_content_copy_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 217 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_content_paste_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 242 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 199 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_done_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 244 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_file_download_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 213 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_file_upload_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 211 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_folder_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 207 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_generic_man.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.6 KiB After Width:  |  Height:  |  Size: 288 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_help_grey600_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 484 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_import_export_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 230 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_lock_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 305 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_lock_open_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 298 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_mode_edit_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 276 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_person_add_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 301 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_person_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 288 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_play_arrow_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 248 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_save_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 259 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_search_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 356 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_select_all_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 224 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_settings_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 423 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_share_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 371 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_view_list_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 170 B

BIN

OpenKeychain/src/main/res/drawable-mdpi/ic_warning_grey_24dp.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 335 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 765 B After Width:  |  Height:  |  Size: 827 B

BIN

OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 884 B

Some files were not shown because too many files have changed in this diff Show More