Vincent Breitmoser 20a6c5ce8a Merge tag 'v3.2.1' into linked-identities ...

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

2015-05-11 17:28:34 +02:00

..

add_email_dialog.xml

Add additional email addresses in create key

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

add_keyserver_dialog.xml

keyserver verification on addition

2015-04-22 06:16:50 +05:30

add_subkey_dialog.xml

Use spinner DatePicker, not full calendar, also on Android 5

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

add_user_id_dialog.xml

Implemented NameEditText

2015-03-09 18:12:44 +05:30

api_account_settings_activity.xml

App settings statusbar fix

2015-02-03 16:10:54 +01:00

api_account_settings_fragment.xml

API 7

2015-03-10 11:34:35 +01:00

api_accounts_adapter_list_item.xml

change icon name in layout files

2015-03-03 11:26:59 -08:00

api_app_settings_activity.xml

Fix colors for remote activity

2015-03-09 16:55:23 +01:00

api_app_settings_fragment.xml

Fix colors for remote activity

2015-03-09 16:55:23 +01:00

api_apps_adapter_list_item.xml

change icon name in layout files

2015-03-03 11:26:59 -08:00

api_remote_create_account.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

api_remote_error_message.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

api_remote_register_app.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

api_remote_select_allowed_keys.xml

API: Allow selection of decryption keys when decryption fails

2015-04-30 18:45:43 +02:00

api_remote_select_pub_keys.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

api_select_sign_key_activity.xml

Allow selection of none in SelectSignKeyIdActivity

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

cert_list_widget.xml

even more linked id ui work

2015-03-29 23:38:01 +02:00

certify_fingerprint_activity.xml

Orange Toolbar Added Fixes #1088

2015-03-04 15:47:44 +05:30

certify_fingerprint_fragment.xml

Fingerprint verification, design fixes for qr code card

2015-02-26 02:06:57 +01:00

certify_item.xml

Rename multi certify files to certify

2014-10-26 22:41:40 +01:00

certify_key_activity.xml

Orange Toolbar Added Fixes #1088

2015-03-04 15:47:44 +05:30

certify_key_fragment.xml

Ripple

2015-03-10 02:13:36 +01:00

create_key_activity.xml

Fix toolbar margins on Android lower 5

2015-03-03 20:15:09 +01:00

create_key_email_fragment.xml

Add additional email addresses in create key

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

create_key_email_list_footer.xml

Add additional email addresses in create key

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

create_key_email_list_item.xml

Ripple

2015-03-10 02:13:36 +01:00

create_key_final_fragment.xml

Ripple

2015-03-10 02:13:36 +01:00

create_key_name_fragment.xml

Manage my keys wizard

2015-03-19 17:16:23 +01:00

create_key_passphrase_fragment.xml

Show passphrase checkbox in create key

2015-03-10 03:46:10 +05:30

create_key_start_fragment.xml

first steps toward yubikey activity

2015-03-21 17:13:35 +01:00

create_yubikey_import_fragment.xml

finish ui flow for yubikey import

2015-03-22 06:36:27 +01:00

create_yubikey_wait_fragment.xml

Fix yubikey strings

2015-05-01 14:48:57 +02:00

custom_actionbar.xml

Custom actionbar to indicate swipe down effect

2014-09-13 22:55:27 +02:00

decrypt_files_activity.xml

Fix nullpointer in file decryption

2015-05-05 09:05:39 +02:00

decrypt_files_fragment.xml

Renaming for consisitency

2015-05-06 03:29:04 +02:00

decrypt_text_activity.xml

Put decrypt result in toolbar, some ui fixes for decrypt

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

decrypt_text_fragment.xml

Merge tag 'v3.2.1' into linked-identities

2015-05-11 17:28:34 +02:00

drawer_custom_header.xml

Once again: Colors and header image

2015-02-22 21:16:40 +01:00

edit_key_activity.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

edit_key_fragment.xml

More icon naming fixes and design

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

edit_subkey_expiry_dialog.xml

Fix expiry dialog, reorder layouts

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

encrypt_asymmetric_fragment.xml

fix encrypt activity layout

2015-04-24 19:17:08 +02:00

encrypt_content_adv_settings.xml

Use Toolbar and new BaseActivity

2015-01-13 23:15:13 +01:00

encrypt_decrypt_overview_fragment.xml

update uris and cookie patterns, plus some stylings

2015-04-25 03:40:38 +02:00

encrypt_files_activity.xml

Start refactoring encrypt ui, EncryptFileActivity no longer crashing

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

encrypt_files_fragment.xml

Fixed Snackbar behind layout

2015-04-22 19:22:12 +05:30

encrypt_symmetric_fragment.xml

Better symmetric encryption layout

2014-09-07 16:14:48 +02:00

encrypt_text_activity.xml

Fixing crashes with new encrypt ui

2015-03-29 20:37:54 +02:00

encrypt_text_fragment.xml

Fixed Snackbar behind layout

2015-04-22 19:22:12 +05:30

file_dialog.xml

change icon name in layout files

2015-03-03 11:26:59 -08:00

file_list_entry_add.xml

Use RecyclerView in EncryptFilesFragment

2015-03-30 20:41:29 +02:00

file_list_entry.xml

Use RecyclerView in EncryptFilesFragment

2015-03-30 20:41:29 +02:00

foldable_linearlayout.xml

Fix multi select and more colors

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

full_screen_dialog_2_cancel_button.xml

Material Design: Full screen dialogs

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

full_screen_dialog_2_done_button.xml

Material Design: Full screen dialogs

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

full_screen_dialog_2.xml

Material Design: Full screen dialogs

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

full_screen_dialog_done_button.xml

Material Design: Full screen dialogs

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

full_screen_dialog_old.xml

Material Design: Full screen dialogs

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

full_screen_dialog.xml

Material Design: Full screen dialogs

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

help_about_fragment.xml

Reference ic_launcher instead of icon

2014-06-18 23:19:54 +02:00

help_activity.xml

Fix elevation

2015-03-06 01:12:33 +01:00

import_keys_activity.xml

Fixed Snackbar behind keyboard on ImportKeysActivity

2015-03-20 19:49:43 +05:30

import_keys_cloud_fragment.xml

Ripple

2015-03-10 02:13:36 +01:00

import_keys_file_fragment.xml

Ripple

2015-03-10 02:13:36 +01:00

import_keys_list_entry_user_id.xml

Merge user ids in import list for better display

2014-09-21 17:58:26 +02:00

import_keys_list_item.xml

Partially fix file names

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

import_keys_qr_code_fragment.xml

Ripple

2015-03-10 02:13:36 +01:00

indeterminate_progress.xml

show refresh key progress inline

2015-02-27 22:46:48 +01:00

key_list_content.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

key_list_fragment.xml

Partially fix file names

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

key_list_header.xml

Create key: design fixes

2014-07-31 23:13:29 +02:00

key_list_item.xml

display creation dates for ambiguous user ids

2015-04-27 17:46:10 +02:00

key_server_editor.xml

Converted all other buttons

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

key_server_preference.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

keyspinner_item.xml

Dont display key ids in KeySpinner, display creation date when user ids duplicate

2015-03-15 15:29:06 +01:00

linked_create_dns_fragment_step1.xml

some linked id ui fine tuning

2015-03-26 13:53:43 +01:00

linked_create_dns_fragment_step2.xml

work on second step of identity creation

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

linked_create_github_fragment_step1.xml

some linked id ui fine tuning

2015-03-26 13:53:43 +01:00

linked_create_github_fragment_step2.xml

support github resource (re)

2015-03-24 02:30:39 +01:00

linked_create_https_fragment_step1.xml

change HttpsEditText to generic PrefixEditText

2015-04-25 03:39:40 +02:00

linked_create_https_fragment_step2.xml

work on second step of identity creation

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

linked_create_twitter_fragment_step1.xml

update uris and cookie patterns, plus some stylings

2015-04-25 03:40:38 +02:00

linked_create_twitter_fragment_step2.xml

update uris and cookie patterns, plus some stylings

2015-04-25 03:40:38 +02:00

linked_create_verify.xml

some linked id ui fine tuning

2015-03-26 13:53:43 +01:00

linked_id_item.xml

small ui niceties

2015-04-27 19:49:42 +02:00

linked_id_view_fragment.xml

minor ui and wording changes

2015-04-09 16:06:37 +02:00

linked_select_fragment.xml

some linked id ui fine tuning

2015-03-26 13:53:43 +01:00

loader_layout.xml

use LoaderFragment for CertifyActivity

2014-08-31 00:19:16 +02:00

log_display_activity.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

log_display_item.xml

change icon name in layout files

2015-03-03 11:26:59 -08:00

main_activity.xml

UI fixes for Android < 5

2015-04-26 01:28:29 +02:00

main_drawer_header.xml

Introduce and Switch to mikepenz/MaterialDrawer

2015-04-24 00:00:58 -07:00

nfc_activity.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

notify_area.xml

Fix background color of notify area

2014-07-27 21:45:48 +02:00

passphrase_dialog.xml

Simplify passphrase dialog design

2015-03-31 00:24:08 +02:00

passphrase_repeat_dialog.xml

Switch to new support lib version 22.1

2015-04-25 23:40:26 +02:00

passphrase_wizard_fragment_nfc.xml

Passphrase wizard tests

2015-01-06 14:52:07 +01:00

passphrase_wizard_fragment_passphrase.xml

Remove old pattern lib, add new pattern lib

2015-02-23 00:28:26 +01:00

passphrase_wizard_fragment_select_methods.xml

Ripple

2015-03-10 02:13:36 +01:00

passphrase_wizard.xml

Passphrase wizard tests

2015-01-06 14:52:07 +01:00

preference_toolbar_activity.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

qr_code_activity.xml

Better qr code resizing

2015-02-27 22:26:11 +01:00

recipient_box_entry.xml

rewrite EncryptKeyCompletionView with generalized KeyAdapter

2015-03-30 02:45:49 +02:00

recipient_selection_list_entry.xml

rewrite EncryptKeyCompletionView with generalized KeyAdapter

2015-03-30 02:45:49 +02:00

safe_slinger_activity.xml

Ripple

2015-03-10 02:13:36 +01:00

select_key_item.xml

Remove display of key id in other lists

2015-03-15 18:40:52 +01:00

select_public_key_activity.xml

Toolbar fixes, Toolbar under status bar on Lollipop

2015-02-03 16:05:18 +01:00

toolbar_inner_layout_white.xml

Tryout design for encrypt, decrypt

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

toolbar_inner_layout.xml

Fix elevation

2015-03-06 01:12:33 +01:00

toolbar_result_decrypt.xml

Put decrypt result in toolbar, some ui fixes for decrypt

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

toolbar_standalone_orange.xml

Fix elevation

2015-03-06 01:12:33 +01:00

toolbar_standalone_white.xml

Tryout design for encrypt, decrypt

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

toolbar_standalone.xml

Fix elevation

2015-03-06 01:12:33 +01:00

toolbar_tabs.xml

Fix elevation

2015-03-06 01:12:33 +01:00

upload_key_activity.xml

Ripple

2015-03-10 02:13:36 +01:00

view_cert_activity.xml

Ripple

2015-03-10 02:13:36 +01:00

view_key_activity.xml

More icon naming fixes and design

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

view_key_adv_activity.xml

Fix elevation

2015-03-06 01:12:33 +01:00

view_key_adv_certs_fragment.xml

Reorder advanced key view

2015-02-27 23:56:53 +01:00

view_key_adv_certs_header.xml

Remove tabs in view key

2015-02-24 11:25:19 +01:00

view_key_adv_certs_item.xml

Remove tabs in view key

2015-02-24 11:25:19 +01:00

view_key_adv_keybase_fragment.xml

More icon naming fixes and design

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

view_key_adv_keybase_proof.xml

Keybase header text

2015-02-27 22:40:52 +01:00

view_key_adv_main_fragment.xml

Reorder advanced key view

2015-02-27 23:56:53 +01:00

view_key_adv_share_fragment.xml

Implemented #1162: Invoke NFC in Advanced View

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

view_key_adv_subkey_item.xml

Ripple

2015-03-10 02:13:36 +01:00

view_key_adv_subkeys_fragment.xml

New advanced key view

2015-02-23 23:03:45 +01:00

view_key_adv_user_id_item.xml

Ripple

2015-03-10 02:13:36 +01:00

view_key_delete_fragment.xml

Fix margins of dialog views

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

view_key_fragment.xml

linked-ids: small compatibility changes

2015-05-11 17:00:45 +02:00

view_key_selectable_user_id_item.xml

make userattributeadapter superclass of useridsadapter

2015-03-02 17:38:05 +01:00

view_key_yubikey.xml

improve status reporting in yubikey dialogue

2015-03-22 03:34:34 +01:00