merged dialog

Browse Source

...

This commit is contained in:

Adithya Abraham Philip

2015-02-26 22:26:40 +05:30

parent ec353b0c39 1210a80a96

commit 99ff9d2340

835 changed files with 14491 additions and 5628 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_encrypt_file.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/ic_mode_edit_white_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_nfc_white_24dp.png Normal file

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

0

OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate.png → OpenKeychain/src/main/res/drawable-hdpi/key_flag_authenticate_24px.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify.png → OpenKeychain/src/main/res/drawable-hdpi/key_flag_certify_24px.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.2 KiB After Width:  |  Height:  |  Size: 2.2 KiB

0

OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt.png → OpenKeychain/src/main/res/drawable-hdpi/key_flag_encrypt_24px.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 1.5 KiB

0

OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign.png → OpenKeychain/src/main/res/drawable-hdpi/key_flag_sign_24px.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.7 KiB

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_focused_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_disabled_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_focused_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_normal_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_off_pressed_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_focused_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_disabled_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_focused_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_normal_holo_light.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_btn_toggle_on_pressed_holo_light.9.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_primary_holo.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_secondary_holo.9.png

Binary file not shown.

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

BIN

OpenKeychain/src/main/res/drawable-hdpi/keychaintheme_scrubber_track_holo_light.9.png

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed.png → OpenKeychain/src/main/res/drawable-hdpi/status_lock_closed_24px.png

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_lock_error.png → OpenKeychain/src/main/res/drawable-hdpi/status_lock_error_24px.png

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_lock_open.png → OpenKeychain/src/main/res/drawable-hdpi/status_lock_open_24px.png

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

BIN

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

Binary file not shown.

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_expired_cutout_24px.png

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_invalid_cutout_24px.png

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

BIN

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

Binary file not shown.

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

BIN

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

Binary file not shown.

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

0

OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout.png → OpenKeychain/src/main/res/drawable-hdpi/status_signature_revoked_cutout_24px.png

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

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