mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more ...

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java

2014-07-31 23:19:01 +02:00

..

apps_conversations.png

Add applications section to help

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

apps_k9.png

Add applications section to help

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

apps_pgpauth.png

Add pgpauth app to help, update html-textview

2014-05-13 18:52:48 +02:00

apptheme_fastscroll_thumb_default_holo.png

ui: purpelize fastscroll thumb

2014-05-07 01:13:08 +02:00

apptheme_fastscroll_thumb_pressed_holo.png

ui: purpelize fastscroll thumb

2014-05-07 01:13:08 +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

Robots like coffee too...

2014-07-31 21:18:24 +02:00

drawer_shadow.9.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_accounts.png

Added new button style and converted account_settings and the select_secret_key_layout to use it

2014-06-29 13:59:51 +02:00

ic_action_add_person.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_cloud.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_collapse.png

Converted all other buttons

2014-06-30 19:09:13 +02:00

ic_action_collection.png

Redesign Import, still some todos and regression bugs

2014-06-18 00:03:06 +02:00

ic_action_copy.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_discard.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_download.png

Use flat buttons where appropriate

2014-05-08 15:46:57 +02:00

ic_action_edit.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_expand.png

Converted all other buttons

2014-06-30 19:09:13 +02:00

ic_action_good.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_help.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_import_export.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_important_small.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_new_account.png

Converted all other buttons

2014-06-30 19:09:13 +02:00

ic_action_nfc.png

Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions

2014-06-18 22:30:54 +02:00

ic_action_not_secure.png

Added unlock icon, fixed drawer items, switched to icons from resource in drawer

2014-06-27 21:03:19 +02:00

ic_action_paste.png

Use paste icon, clarify language once again

2014-05-07 10:59:16 +02:00

ic_action_person.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_play.png

Start app menu item for registered apps

2014-05-07 15:03:24 +02:00

ic_action_qr_code.png

Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions

2014-06-18 22:30:54 +02:00

ic_action_save.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_search.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_secure.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_select_all.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_settings.png

New key view design, using Android flat buttons and Android icons

2014-05-05 00:58:22 +02:00

ic_action_share.png

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ic_action_upload.png

Use flat buttons where appropriate

2014-05-08 15:46:57 +02:00

ic_action_view_as_list.png

Switched to the dark icons

2014-06-28 12:25:41 +02: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_drawer.png

Change drawer nav icon back to gray

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

ic_generic_man.png

Many changes to file ... and still incomplete

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

ic_launcher.png

Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions

2014-06-18 22:30:54 +02:00

keychaintheme_btn_check_off_disabled_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_off_disabled_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_off_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_off_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_off_pressed_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_on_disabled_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_on_disabled_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_on_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_on_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_check_on_pressed_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_default_disabled_focused_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_default_disabled_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_default_focused_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_default_normal_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_default_pressed_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_off_disabled_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_off_disabled_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_off_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_off_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_off_pressed_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_on_disabled_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_on_disabled_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_on_focused_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_on_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_btn_radio_on_pressed_holo_light.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_list_activated_holo.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_list_focused_holo.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_list_longpressed_holo.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_list_pressed_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_list_selector_disabled_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progress_bg_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progress_primary_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progress_secondary_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo1.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo2.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo3.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo4.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo5.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo6.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo7.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_progressbar_indeterminate_holo8.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_spinner_default_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_spinner_disabled_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_spinner_focused_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_spinner_pressed_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_textfield_activated_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_textfield_default_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_textfield_disabled_focused_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_textfield_disabled_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02:00

keychaintheme_textfield_focused_holo_light.9.png

ui: apply purple theme (twi is best color)

2014-05-06 19:18:32 +02: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.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_lock_error.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_lock_open.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_expired_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_expired.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_invalid_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_invalid.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_revoked_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_revoked.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_unknown_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_unknown.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_unverified_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_unverified.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_verified_cutout.png

Smaller status images, green test

2014-07-28 09:10:45 +02:00

status_signature_verified.png

Smaller status images, green test

2014-07-28 09:10:45 +02: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