Vincent Breitmoser 1865852ccc Merge remote-tracking branch 'origin/development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextFragment.java
	OpenKeychain/src/main/res/menu/decrypt_menu.xml

2015-04-26 01:02:22 +02:00

..

apps_conversations.png

Fixes and icons for apps list, also add Password Store

2014-10-25 21:15:05 +02:00

apps_k9.png

Add applications section to help

2014-05-07 18:31:31 +02:00

apps_password_store.png

Fixes and icons for apps list, also add Password Store

2014-10-25 21:15:05 +02:00

attachment_bg_holo.9.png

Many changes to file ... and still incomplete

2014-07-06 02:10:35 +02:00

create_key_robot.png

Fix first time wizard design

2015-02-03 19:13:02 +01:00

drawer_shadow.9.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

ic_action_encrypt_copy_24dp.png

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_file_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_action_encrypt_save_24dp.png

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_share_24dp.png

Improve icons

2015-03-09 13:27:24 +01:00

ic_action_encrypt_text_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_action_search_cloud.png

UI stuff

2014-10-05 10:59:52 +02:00

ic_action_verified_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_action_verified_cutout.png

First work on new key view toolbar

2015-02-25 02:35:09 +01:00

ic_apps_black_24dp.png

Material Design Drawer

2015-01-26 15:24:42 +01:00

ic_arrow_back_white_24dp.png

Toolbar for settings

2015-01-14 20:18:03 +01:00

ic_check_white_24dp.png

Material Design: Full screen dialogs

2015-01-26 00:50:35 +01:00

ic_chevron_left_grey_24dp.png

Make create key wizard step-by-step

2015-03-09 22:00:44 +01:00

ic_chevron_right_grey_24dp.png

Make create key wizard step-by-step

2015-03-09 22:00:44 +01:00

ic_close_black_24dp.png

Redesign of encrypt activites finished

2015-03-09 16:03:58 +01:00

ic_close_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_close_white_24dp.png

Material Design: Full screen dialogs

2015-01-26 00:50:35 +01:00

ic_cloud_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_cloud_search_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_comment_text_grey600_24dp.png

Tryout design for encrypt, decrypt

2015-03-06 01:52:06 +01:00

ic_content_copy_black_24dp.png

Put decrypt result in toolbar, some ui fixes for decrypt

2015-04-26 00:33:26 +02:00

ic_content_copy_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_content_paste_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_delete_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_dialog_alert_holo_light.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

ic_doc_generic_am.png

Many changes to file ... and still incomplete

2014-07-06 02:10:35 +02:00

ic_done_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_drawer.png

Change drawer nav icon back to gray

2014-05-07 11:15:40 +02:00

ic_email_grey_24dp.png

Add additional email addresses in create key

2015-03-10 01:44:07 +01:00

ic_expand_less_black_24dp.png

Material Design: Full screen dialogs

2015-01-26 00:50:35 +01:00

ic_expand_more_black_24dp.png

Material Design: Full screen dialogs

2015-01-26 00:50:35 +01:00

ic_file_download_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_file_upload_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_folder_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_folder_white_24dp.png

Floating action button icons and methods for key list

2015-02-21 20:46:37 +01:00

ic_generic_man.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_help_black_24dp.png

Move key list logic into fragment, UI fixes for nav drawer

2015-01-29 10:10:07 +01:00

ic_help_grey_24dp.png

More icon naming fixes and design

2015-03-04 20:03:20 +01:00

ic_import_export_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_key_plus_grey600_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

ic_launcher.png

Launcher icon fixes

2015-01-14 02:03:20 +01:00

ic_lock_black_24dp.png

Move encrypt decrypt operations in own starter activity

2015-02-03 18:39:07 +01:00

ic_lock_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_lock_open_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_lock_white_24dp.png

Fix multi select and more colors

2015-02-22 23:52:29 +01:00

ic_mode_edit_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_mode_edit_white_24dp.png

Toolbar: qr code in header, cleanup of fragment

2015-02-25 13:49:21 +01:00

ic_nfc_grey_24dp.png

Implemented #1162: Invoke NFC in Advanced View

2015-03-20 06:31:18 +08:00

ic_nfc_white_24dp.png

Invoke NFC button

2015-02-25 20:50:34 +01:00

ic_person_add_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_person_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_person_grey_48dp.png

Make create key wizard step-by-step

2015-03-09 22:00:44 +01:00

ic_play_arrow_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_play_arrow_white_24dp.png

Floating Action Button added in app settings

2015-02-03 14:28:54 +01:00

ic_qrcode_white_24dp.png

Fix QR Code, design experiments for key view

2015-02-24 13:43:24 +01:00

ic_refresh_white_24dp.png

Material Design: Full screen dialogs

2015-01-26 00:50:35 +01:00

ic_repeat_grey_24dp.png

Other icon for key exchange

2015-02-25 20:20:39 +01:00

ic_repeat_white_24dp.png

Other icon for key exchange

2015-02-25 20:20:39 +01:00

ic_save_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_save_white_24dp.png

Use material save icon

2015-03-04 20:57:11 +01:00

ic_search_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_search_white_24dp.png

Reorganize folders of graphics sources

2015-01-14 14:52:23 +01:00

ic_select_all_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_settings_black_24dp.png

Material Design Drawer

2015-01-26 15:24:42 +01:00

ic_settings_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_share_black_24dp.png

Put decrypt result in toolbar, some ui fixes for decrypt

2015-04-26 00:33:26 +02:00

ic_share_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_view_list_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

ic_vpn_key_black_24dp.png

Material Design Drawer

2015-01-26 15:24:42 +01:00

ic_vpn_key_grey_24dp.png

Design fixes for decryption screen

2015-03-05 11:06:17 +01:00

ic_warning_grey_24dp.png

download new material design icons

2015-03-03 10:36:38 -08:00

key_flag_authenticate_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

key_flag_certify_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

key_flag_encrypt_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

key_flag_sign_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

linked_dns.png

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_github.png

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_https.png

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

linked_twitter.png

more linked id ui fine tuning

2015-03-26 16:30:49 +01:00

minus.png

Ported even more buttons to use new design (Key and User editor)

2014-06-29 22:31:37 +02:00

plus.png

Ported even more buttons to use new design (Key and User editor)

2014-06-29 22:31:37 +02:00

status_lock_closed_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_lock_error_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_lock_open_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_expired_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_expired_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_invalid_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_invalid_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_revoked_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_revoked_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_unknown_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_unknown_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_unverified_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_unverified_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_verified_cutout_24dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_verified_cutout_96dp.png

Partially fix file names

2015-03-04 19:04:15 +01:00

status_signature_verified_inner_24dp.png

work on certification ui

2015-03-15 22:10:05 +01:00

status_signature_verified_inner_96dp.png

work on certification ui

2015-03-15 22:10:05 +01:00

uid_mail_bad.png

use project icons for certification status

2014-04-17 14:42:24 +02:00

uid_mail_ok.png

use project icons for certification status

2014-04-17 14:42:24 +02:00

yubi_icon_24dp.png

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00

yubi_icon.png

split up wait/action yubikey fragments

2015-03-21 22:18:58 +01:00