ZXing/zxing-android-embedded.git/src/com/google/zxing/client/android/CaptureActivityHandler.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-09T13:40:10+00:00 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 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 Various changes from IJ12.1 inspections 2013-03-01T20:01:40+00:00 srowen@gmail.com srowen@gmail.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-03-01T20:01:40+00:00 urn:sha1:4406ac385b04139b807898a642cfd4bedaba129c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Don't use inMutable, which is only in API 11+ 2013-01-22T08:47:40+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2013-01-22T08:47:40+00:00 urn:sha1:6815e404cd468de43fc0bdba2754a6718e92df6d git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2565 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 Initial preparation for use as a library project. 2012-11-28T13:50:45+00:00 Ralf Kistner ralf.kistner@gmail.com 2012-11-28T13:50:45+00:00 urn:sha1:2c01eb94e67553be366842dd6643afc0cf6dd638 1. Add pom.xml and Readme.md. 2. Change switch statements on resource id's to if/else statements. 3. Use Android API level 16 instead of 17 for now. Issue 1409 also include Chrome in code to reuse browser tab 2012-10-22T15:21:50+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-10-22T15:21:50+00:00 urn:sha1:5acd9e8eb64e0ba6216ae245b3b172e947b5077c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2479 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Issue 1409 try to reuse browser tab on Intent reply 2012-10-22T07:46:57+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-10-22T07:46:57+00:00 urn:sha1:b94ae158c26eb14e4797c93b4d090ea1dc234f4f git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2464 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Issue 1392 log and warn about bad return URLs 2012-10-03T21:21:37+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-10-03T21:21:37+00:00 urn:sha1:308763f6c7a29e2ad1e8ae9b06983dc1f79bbaaf git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2448 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Back-port rewritten auto-focus cycle; allow disabling of auto focus 2012-05-10T10:40:55+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-05-10T10:40:55+00:00 urn:sha1:0a7ab5413e2677013a27ae1aa2c931c50eee8e6c git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2285 59b500cc-1b3d-0410-9834-0bbf25fbcc57