fix some small layout bugs, add barcode scanner lib as source lib, fix qr code scanning issues

2014-01-14 21:19:43 +01:00
parent 008db45dff
commit 59217ec9ba
20 changed files with 703 additions and 569 deletions
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,5 +2,6 @@ include ':OpenPGP-Keychain'
 include ':libraries:ActionBarSherlock'
 include ':libraries:HtmlTextView'
 include ':libraries:StickyListHeaders:library'
-include ':libraries:zxing'
 include ':libraries:AndroidBootstrap'
+include ':libraries:zxing'
+include ':libraries:zxing-android-integration'