Merge remote-tracking branch 'origin/master' into wrapped-key-ring

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml

...

This commit is contained in:

Vincent Breitmoser

2014-05-14 16:02:28 +02:00

parent 90ac60b6db 638554f256

commit 2f95100d88

505 changed files with 4694 additions and 5904 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/apptheme_fastscroll_thumb_default_holo.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.5 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.9 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

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