Vincent Breitmoser b779211f55 Merge branch 'master' into v/multi-decrypt ...

this also fixes weird-bug

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
	OpenKeychain/src/main/res/values/strings.xml

2015-06-06 23:40:22 +02:00

..

arrays.xml

Fix onTouchEvent delegation, with workaround for Android bug

2014-06-20 15:39:27 +02:00

attr.xml

Implemented Matt Allen password strength indicator

2015-03-03 16:23:43 -03:00

colors.xml

Remove old navigation drawer dependency

2015-04-25 14:06:53 +02:00

dimens.xml

Fix toolbar margins on Android lower 5

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

ids.xml

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

strings.xml

Merge branch 'master' into v/multi-decrypt

2015-06-06 23:40:22 +02:00

styles.xml

Ripple

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

themes.xml

UI fixes for Android < 5

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