Vincent Breitmoser 6bacb5ff51 Merge branch 'certify' into certs ...

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
	OpenPGP-Keychain/src/main/res/values/strings.xml

2014-03-15 18:34:20 +01:00

..

actionbar_custom_view_done_cancel.xml

Switch from ActionBarSherlock to ActionBarCompat

2014-02-02 14:13:09 +01:00

actionbar_custom_view_done.xml

Switch from ActionBarSherlock to ActionBarCompat

2014-02-02 14:13:09 +01:00

actionbar_include_cancel_button.xml

Revert "Lint changes"

2014-03-10 18:23:47 +01:00

actionbar_include_done_button.xml

Revert "Lint changes"

2014-03-10 18:23:47 +01:00

api_app_error_message.xml

fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions

2014-03-11 23:42:45 +02:00

api_app_register_activity.xml

Fix ScrollViewSize Lint Warnings

2014-03-03 11:48:45 +01:00

api_app_select_pub_keys_activity.xml

fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions

2014-03-11 23:42:45 +02:00

api_app_settings_activity.xml

Fix ScrollViewSize Lint Warnings

2014-03-03 11:48:45 +01:00

api_app_settings_fragment.xml

Layout fixes for registered apps

2014-02-13 23:34:57 +01:00

api_apps_adapter_list_item.xml

Layout fixes for registered apps

2014-02-13 23:34:57 +01:00

api_apps_list_activity.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

certify_key_activity.xml

certify: revamp certifykeyactivity

2014-03-15 18:20:49 +01:00

create_key_dialog.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

decrypt_activity.xml

XML cleanup and bigger filename EditText

2014-03-13 18:53:21 +01:00

drawer_list_item.xml

drawer icons have not the same width, fix this

2014-02-05 00:26:06 +01:00

drawer_list.xml

@color/white instead of hex

2014-03-10 18:26:52 +01:00

edit_key_activity.xml

corrected commit

2014-03-07 00:43:09 +05:30

edit_key_key_item.xml

move hardcode strings to strings.xml

2014-03-07 22:35:49 +02:00

edit_key_section.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

edit_key_user_id_item.xml

Merge pull request #396 from bhargavgolla/Lint-error-fix

2014-03-12 22:28:25 +01:00

encrypt_activity.xml

XML cleanup and bigger filename EditText

2014-03-13 18:53:21 +01:00

file_dialog.xml

XML cleanup and bigger filename EditText

2014-03-13 18:53:21 +01:00

help_about_fragment.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

help_activity.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

import_keys_activity.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

import_keys_clipboard_fragment.xml

Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry)

2014-02-01 16:17:33 +01:00

import_keys_file_fragment.xml

Started working on integration of keyserver query into import activity

2014-02-01 18:13:26 +01:00

import_keys_list_entry_user_id.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

import_keys_list_entry.xml

move hardcode strings to strings.xml

2014-03-07 22:35:49 +02:00

import_keys_nfc_fragment.xml

Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry)

2014-02-01 16:17:33 +01:00

import_keys_qr_code_fragment.xml

Fix layout, add API notes to README, register fingerprint URIs, some reformatting (sry)

2014-02-01 16:17:33 +01:00

import_keys_server_fragment.xml

Reworking import, testing needed...

2014-02-01 21:55:34 +01:00

key_list_activity.xml

copy public keylist as stub for unified keylist

2014-03-06 01:32:18 +01:00

key_list_fragment.xml

Merge branch 'unified-keylist'

2014-03-12 18:05:28 +01:00

key_list_header.xml

add contact count to My Keys header

2014-03-08 14:52:29 +01:00

key_list_item.xml

Fix colors in item view

2014-03-13 20:18:25 +01:00

key_server_editor.xml

Lint changes after testing

2014-03-10 14:59:15 -04:00

key_server_export.xml

fix plenty of lint warnings, make some for loops into foreach, remove unused imports and throw exceptions

2014-03-11 23:42:45 +02:00

key_server_preference.xml

Lint changes after testing

2014-03-10 14:59:15 -04:00

passphrase_dialog.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

passphrase_repeat_dialog.xml

Fix to passphrase dialog and Issue #207

2014-03-10 08:31:53 +05:30

select_key_item.xml

move hardcode strings to strings.xml

2014-03-07 22:35:49 +02:00

select_public_key_activity.xml

move search view from activity to fragment by setting it as a list header, better reusability! Required for service activites

2014-03-07 21:32:24 +01:00

select_secret_key_activity.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

select_secret_key_layout_fragment.xml

certify: selectsecretkeyfragment cosmetics

2014-03-15 18:20:49 +01:00

share_qr_code_dialog.xml

New Gradle project structure

2014-01-27 14:18:25 +01:00

view_cert_activity.xml

add view cert activity

2014-03-12 02:25:48 +01:00

view_key_activity.xml

rework key view into fragments to later add certifications

2014-02-09 21:17:30 +01:00

view_key_certs_fragment.xml

add empty view to viewkeycertsfragment

2014-03-12 02:47:19 +01:00

view_key_certs_header.xml

forgot to commit two layout files

2014-03-11 03:19:41 +01:00

view_key_certs_item.xml

forgot to commit two layout files

2014-03-11 03:19:41 +01:00

view_key_keys_item.xml

move hardcode strings to strings.xml

2014-03-07 22:35:49 +02:00

view_key_main_fragment.xml

certify: add certify action button to viewkeymainfragment

2014-03-15 18:20:42 +01:00

view_key_userids_item.xml

certify: viewkeyuseridsadapter cosmetics and checkbox capability

2014-03-15 18:20:49 +01:00