ZXing/zxing-android-embedded.git/src/com/google/zxing/client/android/CaptureActivity.java, branch 1.1.x Barcode scanner library for Android, based on the ZXing decoder (mirror) https://git.radix-linux.su/ZXing/zxing-android-embedded.git/atom?h=1.1.x 2013-07-09T14:24:32+00:00 Handle NPE when scanning PDF417 barcodes. 2013-07-09T14:24:32+00:00 Ralf Kistner ralf.kistner@gmail.com 2013-07-09T14:24:32+00:00 urn:sha1:7708f2efff7da3215c22dfbf3bd15f6ba6d8fe86 Merge branch 'upstream-2.2' 2013-07-09T13:40:10+00:00 Ralf Kistner ralf.kistner@gmail.com 2013-07-09T13:35:11+00:00 urn:sha1:470f89c74683fce963bb973e40a619e10c3eb4eb 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 Avoid weird NPE and don't obfuscate anymore -- no need 2013-04-27T12:23:55+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-27T12:23:55+00:00 urn:sha1:0047fa48bfe26150df90a9a438c4c4d45145e9d8 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2698 59b500cc-1b3d-0410-9834-0bbf25fbcc57 By request, let's show a bit of the scanned string when scanning by Intent in the Toast popup 2013-04-15T18:18:00+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-04-15T18:18:00+00:00 urn:sha1:08794006d9abd692fc37494a89a77d05a5f36874 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2656 59b500cc-1b3d-0410-9834-0bbf25fbcc57 First cut at specifying hints by Intent from Lachezar 2013-03-29T14:39:31+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-03-29T14:39:31+00:00 urn:sha1:ad998a121e190d025411b487501aa8d5170c8de4 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2599 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Try to avoid another clipboard-related NPE 2013-01-20T00:02:55+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-01-20T00:02:55+00:00 urn:sha1:a6d63d83b39ad0efdd58794337e82275ee623ca4 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2564 59b500cc-1b3d-0410-9834-0bbf25fbcc57 On scan we pass a grayscale image of the scanned image, which is used as a thumbnail. These days this is getting to be 2MB of data to bundle to copy around in memory. Instead scale by 50% and JPEG-encode. This saves some memory and paves the way for later perhaps saving the image data with history. 2013-01-19T20:48:03+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-01-19T20:48:03+00:00 urn:sha1:7bc4562a6cbc472a6bb871a73b18fc48da85b583 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2561 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Namespace some resources to prevent conflicts. 2012-12-14T09:07:01+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-12-14T09:07:01+00:00 urn:sha1:0850d50f93a67f557c677cac4daf5bcc151c0378 Also removed some unused resources. Remove unused code and assets. 2012-11-29T10:50:10+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-11-29T10:48:26+00:00 urn:sha1:f88940c8292a53334bc4dcf4fa33d243f9a74e0f Replace the about dialog with a stripped-down version of the original help screen. 2012-11-29T10:26:11+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-11-29T10:24:27+00:00 urn:sha1:0d9d306fee842985e87c0b920c1806e6d7238d4c