ZXing/zxing-android-embedded.git/src/com/google/zxing/client/android/DecodeThread.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 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 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 Actually use CheckboxPreference defaults in preferences.xml! 2012-01-01T21:49:17+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2012-01-01T21:49:17+00:00 urn:sha1:9161b6c2f9035869ff71274891f863b5353e3239 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2101 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Update all Java code to use Java 6 2011-11-02T11:16:30+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2011-11-02T11:16:30+00:00 urn:sha1:d77b5a6affdf614f3416b165d62bfae16930d6fc git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57 - Added support for xlarge screens to handle tablets and disable compatibility mode. 2011-06-01T20:27:03+00:00 dswitkin@google.com dswitkin@google.com@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2011-06-01T20:27:03+00:00 urn:sha1:9c0a9793dd4abd8d72e1354014ffc11e38880ce1 - Improved the layout of the Share screen on big screens. - Other minor cleanup. - Bumped the version to 3.6 final. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1807 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Turn on Data Matrix, including separate scan option in Android 2010-09-09T07:30:57+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2010-09-09T07:30:57+00:00 urn:sha1:8bf9681460e9ada1896496678f113138c5f18e98 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1579 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Issue 460, auto timeout of CaptureActivity after inactivity, for testing. Also break out some code from CaptureActivity to reduce its size. 2010-08-13T17:18:53+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2010-08-13T17:18:53+00:00 urn:sha1:90d6715da73d8099875127c7b44c96fa178cba06 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1529 59b500cc-1b3d-0410-9834-0bbf25fbcc57 Commit good fix for race condition Daniel noted 2010-05-15T11:28:43+00:00 srowen srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57 2010-05-15T11:28:43+00:00 urn:sha1:0c8224f93ce065393b01ea7b6cb2f033f74afda1 git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1366 59b500cc-1b3d-0410-9834-0bbf25fbcc57