open-keychain/OpenKeychain/src/main/res/layout
mar-v-in fdf6411d5f Merge branch 'master' into improve-file-more
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
2014-07-06 02:24:34 +02:00
..
actionbar_custom_view_done.xml
actionbar_custom_view_done_cancel.xml
actionbar_include_cancel_button.xml
actionbar_include_done_button.xml
api_account_settings_activity.xml
api_account_settings_fragment.xml 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
api_accounts_adapter_list_item.xml
api_app_settings_activity.xml Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
api_app_settings_fragment.xml Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
api_apps_adapter_list_item.xml Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
api_apps_list_activity.xml Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
api_apps_list_content.xml
api_remote_create_account.xml
api_remote_error_message.xml
api_remote_register_app.xml
api_remote_select_pub_keys.xml
certify_key_activity.xml Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
create_key_dialog.xml Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. 2014-04-08 23:59:41 +02:00
decrypt_activity.xml Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
decrypt_content.xml A little bit less purple 2014-07-02 18:59:23 +02:00
decrypt_file_fragment.xml Encrypt/Decrypt UI work 2014-07-02 00:34:21 +02:00
decrypt_message_fragment.xml Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
decrypt_result_include.xml Converted all other buttons 2014-06-30 19:09:13 +02:00
drawer_list.xml
drawer_list_item.xml Added unlock icon, fixed drawer items, switched to icons from resource in drawer 2014-06-27 21:03:19 +02:00
edit_key_activity.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
edit_key_activity_new.xml Start new designed activity 2014-06-21 20:25:51 +02:00
edit_key_fragment.xml Use strings in edit key 2014-07-03 16:49:25 +02:00
edit_key_key_item.xml (should have) fixed Travis builds 2014-06-30 21:24:31 +02:00
edit_key_section.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
edit_key_subkey_added_item.xml Cache passphrase for edit 2014-07-03 15:48:46 +02:00
edit_key_user_id_added_item.xml Work on edit 2014-07-03 15:06:05 +02:00
edit_key_user_id_item.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
encrypt_activity.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
encrypt_asymmetric_fragment.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
encrypt_content.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
encrypt_content_adv_settings.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
encrypt_file_fragment.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
encrypt_message_fragment.xml Some small style fixes 2014-05-06 23:11:10 +02:00
encrypt_symmetric_fragment.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
file_dialog.xml Updated file_dialog to use the new buttons 2014-06-29 13:21:33 +02:00
file_list_entry.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
file_list_entry_add.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
foldable_linearlayout.xml (should have) fixed Travis builds 2014-06-30 21:24:31 +02:00
help_about_fragment.xml Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
help_activity.xml Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
import_keys_activity.xml work on edit key 2014-06-30 22:01:17 +02:00
import_keys_file_fragment.xml Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
import_keys_keybase_fragment.xml decrease size of search icons in import 2014-06-18 23:06:58 +02:00
import_keys_list_entry.xml Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
import_keys_list_entry_user_id.xml Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
import_keys_qr_code_fragment.xml Remove unused code to import splitted qr codes 2014-06-19 00:54:52 +02:00
import_keys_server_fragment.xml decrease size of search icons in import 2014-06-18 23:06:58 +02:00
key_list_activity.xml Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
key_list_content.xml
key_list_fragment.xml Converted all other buttons 2014-06-30 19:09:13 +02:00
key_list_header.xml Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
key_list_item.xml edit key: work on saving 2014-07-02 15:42:38 +02:00
key_server_editor.xml Converted all other buttons 2014-06-30 19:09:13 +02:00
key_server_preference.xml Converted all other buttons 2014-06-30 19:09:13 +02:00
loader_layout.xml extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
log_display_activity.xml Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
log_display_fragment.xml import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
log_display_item.xml import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
notify_area.xml work on edit key 2014-06-30 22:01:17 +02:00
passphrase_dialog.xml
passphrase_repeat_dialog.xml Cache passphrase for edit 2014-07-03 15:48:46 +02:00
recipient_box_entry.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
recipient_selection_list_entry.xml Many changes to file ... and still incomplete 2014-07-06 02:10:35 +02:00
select_key_item.xml Prettify more layouts 2014-04-11 16:00:37 +02:00
select_public_key_activity.xml
select_secret_key_activity.xml
select_secret_key_layout_fragment.xml 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
share_qr_code_dialog.xml
upload_key_activity.xml Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
view_cert_activity.xml Better handling of actionbars back 2014-05-07 14:33:20 +02:00
view_key_activity.xml pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
view_key_certs_fragment.xml center empty-info of cert fragment, closes #566 2014-04-15 22:41:47 +02:00
view_key_certs_header.xml Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
view_key_certs_item.xml New key view design, using Android flat buttons and Android icons 2014-05-05 00:58:22 +02:00
view_key_delete_fragment.xml Simplify and fix delete key dialog 2014-04-11 19:52:59 +02:00
view_key_keys_fragment.xml use LoaderFragment in ViewKey tabs 2014-05-08 13:58:52 +02:00
view_key_keys_item.xml ui: subkey view redesign 2014-05-05 22:06:09 +02:00
view_key_main_fragment.xml Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
view_key_share_fragment.xml Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
view_key_userids_item.xml Work on edit 2014-07-03 15:06:05 +02:00
wizard_activity.xml Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
wizard_create_key_fragment.xml Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
wizard_k9_fragment.xml More wizardry 2014-06-27 23:01:11 +02:00
wizard_start_fragment.xml Start work on a first-time wizard 2014-06-27 21:40:18 +02:00