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/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -24,8 +24,9 @@ dependencies {
    compile project(':libraries:ActionBarSherlock')
    compile project(':libraries:HtmlTextView')
    compile project(':libraries:StickyListHeaders:library')
-    compile project(':libraries:zxing')
    compile project(':libraries:AndroidBootstrap')
+    compile project(':libraries:zxing')
+    compile project(':libraries:zxing-android-integration')
 }

 android {