summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-05-16Update readme and add CHANGES.md.Ralf Kistner2-1/+5
2014-05-16Release 1.2.1.Ralf Kistner1-1/+1
2014-05-16Add release script.Ralf Kistner3-2/+23
2014-05-16Merge branch 'sample-project'Ralf Kistner136-5/+174
2014-05-16Add a sample project.Ralf Kistner17-4/+172
This greatly speeds up the development/test cycle.
2014-05-16Move library into a subfolder.Ralf Kistner122-2/+3
2014-05-16Add instructions for usage from a Fragment.Ralf Kistner1-3/+7
Fixes #8.
2014-05-16Modify and merge #10.Ralf Kistner8-52/+350
2014-05-08Switch to new Travis Android support.Ralf Kistner1-12/+7
2014-04-04Fix Android SDK installation on Travis.Ralf Kistner1-2/+2
2014-04-04Add "Sponsored by Journey".Ralf Kistner1-0/+8
2014-02-20Bump version in readme example.Ralf Kistner1-1/+1
2014-02-20Merge branch 'develop'Ralf Kistner6-153/+72
2014-02-201.2.0. Drop support for apklibs.Ralf Kistner4-126/+4
2014-02-191.1.5 bump.Ralf Kistner1-1/+1
2014-02-19Refactor IntentIntegrator to be more flexible.Ralf Kistner1-25/+61
2014-01-31Use gradle with sources.Ralf Kistner1-2/+2
2014-01-31Don't fail on lint errors.Ralf Kistner1-0/+5
2014-01-30Update gradle and Android plugin versions.1.1.xRalf Kistner3-3/+4
2014-01-06Merge branch 'maven31'Ralf Kistner1-1/+1
2014-01-06Update to Android Maven Plugin 3.8.2.Ralf Kistner1-1/+1
2014-01-06Use Android Maven plugin 3.8.0.Ralf Kistner1-1/+1
This should be compatible with Maven 3.1.
2013-10-24Update build tool versions.Ralf Kistner3-4/+4
Android build-tools 18.1.0. Gradle 1.8. Android Gradle Plugin 0.6.3.
2013-10-24Perhaps we do need `apt-get update` on Travis.Ralf Kistner1-0/+1
2013-10-24Update Travis config for Android SDK installation.Ralf Kistner1-11/+4
2013-10-24Add com.google.zxing:core:2.2 dependency to sample Gradle fileRalf Kistner1-0/+1
Fixes #3
2013-07-30Improve Gradle output on Travis.Ralf Kistner1-2/+2
2013-07-29Update readme.Ralf Kistner2-51/+41
2013-07-29Update Android SDK and use build-tools 18.0.0.Ralf Kistner2-4/+4
2013-07-29Try again.Ralf Kistner1-2/+2
2013-07-29Add debugging info for Travis.Ralf Kistner1-1/+1
2013-07-29Update android-maven-plugin to 3.6.0.Ralf Kistner1-1/+9
2013-07-29Also install android-16 on Travis.Ralf Kistner1-1/+1
We need it for Maven.
2013-07-29Add travis configuration.Ralf Kistner1-0/+24
2013-07-29Update Gradle plugin to 0.5.2.Ralf Kistner1-1/+1
2013-07-29Merge pull request #2 from bryancallahan/masterRalf Kistner1-0/+6
Fix for "cannot find symbol: class TargetApi" compilation error (build depends on the google annotations lib)
2013-07-28Build depends on the google annotations lib, otherwise it fails during compileBryan Callahan1-0/+6
2013-07-09Ignore decode exceptions instead of crashing.Ralf Kistner3-3/+3
2013-07-09Handle NPE when scanning PDF417 barcodes.Ralf Kistner1-1/+3
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner66-215/+1350
Conflicts: AndroidManifest.xml assets/html-de/index.html assets/html-de/whatsnew.html assets/html-en/index.html assets/html-es/index.html assets/html-es/whatsnew.html assets/html-fr/index.html assets/html-fr/whatsnew.html assets/html-it/index.html assets/html-it/whatsnew.html assets/html-ja/index.html assets/html-ja/whatsnew.html assets/html-ko/index.html assets/html-ko/whatsnew.html assets/html-nl/index.html assets/html-nl/whatsnew.html assets/html-pt/index.html assets/html-pt/whatsnew.html assets/html-ru/index.html assets/html-ru/whatsnew.html assets/html-zh-rCN/index.html assets/html-zh-rCN/whatsnew.html assets/html-zh-rTW/index.html assets/html-zh-rTW/whatsnew.html res/layout/bookmark_picker_list_item.xml src/com/google/zxing/client/android/CaptureActivity.java src/com/google/zxing/client/android/CaptureActivityHandler.java src/com/google/zxing/client/android/HttpHelper.java src/com/google/zxing/client/android/LocaleManager.java src/com/google/zxing/client/android/book/SearchBookContentsResult.java src/com/google/zxing/client/android/history/HistoryManager.java src/com/google/zxing/client/android/result/AddressBookResultHandler.java src/com/google/zxing/client/android/result/ProductResultHandler.java src/com/google/zxing/client/android/result/ResultHandler.java src/com/google/zxing/client/android/result/SMSResultHandler.java src/com/google/zxing/client/android/result/supplement/BookResultInfoRetriever.java src/com/google/zxing/client/android/result/supplement/SupplementalInfoRetriever.java src/com/google/zxing/client/android/result/supplement/URIResultInfoRetriever.java src/com/google/zxing/client/android/share/AppPickerActivity.java src/com/google/zxing/client/android/share/BookmarkPickerActivity.java src/com/google/zxing/client/android/share/LoadPackagesAsyncTask.java src/com/google/zxing/client/android/share/ShareActivity.java src/com/google/zxing/client/android/wifi/WifiConfigManager.java
2013-07-02Build artifacts for maven.Ralf Kistner2-0/+12
2013-07-01Add gradle build file.Ralf Kistner6-0/+219
Still need to find a place to publish this. Github?
2013-07-01Make all features in AndroidManifest.xml optional.Ralf Kistner2-5/+3
The application using the library should have the option to make these optional.
2013-05-14Fix error when follow RSS product result to Google Shoppersrowen@gmail.com1-11/+12
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2793 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-14Avoid weird NPE observed in 4.3.2srowen@gmail.com1-2/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2792 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-14Pull request 11 - Finnish updatesrowen@gmail.com1-4/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2791 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-09Issue 1679 Italian updatessrowen@gmail.com1-2/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2718 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-07MECARD TEL should have only digitssrowen@gmail.com1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2714 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-04More rational sizing of reticle (max size 50% of screen dimension) but also ↵srowen@gmail.com1-14/+17
allow larger reticles to accomodate very high res new devices like the S4 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2709 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-05-03Bump to allow full WXGA resolutionsrowen@gmail.com1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2707 59b500cc-1b3d-0410-9834-0bbf25fbcc57