Vincent Breitmoser a6e25e6448 Merge branch 'linked-identities' (and fix OperationHelper ids) ... Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md		2015-08-29 13:28:56 +02:00
..
fade_in.xml	show status indicators in EncryptFragment	2015-05-30 02:24:45 +02:00
fade_in_down.xml	some linked id ui fine tuning	2015-03-26 13:53:43 +01:00
fade_in_quick.xml	some linked id ui fine tuning	2015-03-26 13:53:43 +01:00
fade_in_up.xml	work on certification ui	2015-03-15 22:10:05 +01:00
fade_out.xml	show status indicators in EncryptFragment	2015-05-30 02:24:45 +02:00
fade_out_down.xml	work on certification ui	2015-03-15 22:10:05 +01:00
fade_out_quick.xml	some linked id ui fine tuning	2015-03-26 13:53:43 +01:00
fade_out_up.xml	some linked id ui fine tuning	2015-03-26 13:53:43 +01:00
frag_slide_in_from_left.xml
frag_slide_in_from_right.xml
frag_slide_out_to_left.xml
frag_slide_out_to_right.xml
qr_code_zoom_enter.xml
qr_code_zoom_exit.xml
rotate.xml	show refresh key progress inline	2015-02-27 22:46:48 +01:00
rotate_spin.xml	show refresh key progress inline	2015-02-27 22:46:48 +01:00