Dominik Schürmann 5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development ...

Conflicts:
	OpenKeychain/build.gradle

2015-01-29 09:55:09 +01:00

..

arrays.xml

Fix onTouchEvent delegation, with workaround for Android bug

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

attr.xml

Cleanup FoldableLinearLayout

2014-08-27 13:54:33 +02:00

colors_keychaintheme.xml

Green

2015-01-13 22:18:40 +01:00

colors.xml

Start working on Material Design

2015-01-13 21:55:53 +01:00

dimens.xml

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

ids.xml

Rename folder structure from OpenPGP Keychain to OpenKeychain

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

strings.xml

Merge remote-tracking branch 'origin/t/snackbar' into development

2015-01-29 09:55:09 +01:00

styles_keychaintheme.xml

Green

2015-01-13 22:18:40 +01:00

styles.xml

Better way to have dark toolbar and light theme

2015-01-14 13:19:21 +01:00

themes_keychaintheme.xml

Green

2015-01-13 22:18:40 +01:00

themes.xml

Temporary nav drawer fixes

2015-01-27 09:37:07 +01:00