PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity
open-keychain/OpenKeychain/src/main/res/drawable
History
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
..
button_edgy.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
button_no_style.xml Converted all other buttons 2014-06-30 19:09:13 +02:00
button_rounded.xml Improved button style 2014-06-29 12:33:02 +02:00
button_rounded_blue.xml Keys found on multiple servers are now imported from all of them 2014-09-13 21:43:07 -07:00
button_rounded_green.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
button_rounded_red.xml Ported even more buttons to use new design (Key and User editor) 2014-06-29 22:31:37 +02:00
cardview_header.xml fixed crash on api < 21 due to drawable using attrs 2015-08-06 02:02:11 +05:30
divider.xml Merge branch 'linked-identities' (and fix OperationHelper ids) 2015-08-29 13:28:56 +02:00
drawer_header.png Once again: Colors and header image 2015-02-22 21:16:40 +01:00
fab_label_background.xml fixed crash on api < 21 due to drawable using attrs 2015-08-06 02:02:11 +05:30
first_time_1.png Fix first time wizard design 2015-02-03 19:13:02 +01:00
nfc.png Passphrase wizard tests 2015-01-06 14:52:07 +01:00
scrim_bottom.xml Add missing scrim drawable 2015-08-28 14:25:20 +02:00
section_header_dark.xml fixed crash on api < 21 due to drawable using attrs 2015-08-06 02:02:11 +05:30
section_header_light.xml fixed crash on api < 21 due to drawable using attrs 2015-08-06 02:02:11 +05:30
yubikey_phone.png New NFC dialog design with indeterminate progress, do NFC stuff in background 2015-07-03 04:58:30 +02:00