summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/DecodeThread.java
AgeCommit message (Collapse)AuthorFilesLines
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner1-0/+7
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-03-29First cut at specifying hints by Intent from Lachezarsrowen@gmail.com1-0/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2599 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-01-20On scan we pass a grayscale image of the scanned image, which is used as a ↵srowen1-0/+1
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. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2561 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-29Remove unused code and assets.Ralf Kistner1-13/+0
2012-01-02Actually use CheckboxPreference defaults in preferences.xml!srowen1-3/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2101 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-02Update all Java code to use Java 6srowen1-6/+8
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-02- Added support for xlarge screens to handle tablets and disable ↵dswitkin@google.com1-1/+0
compatibility mode. - 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
2010-09-09Turn on Data Matrix, including separate scan option in Androidsrowen1-10/+10
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1579 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-13Issue 460, auto timeout of CaptureActivity after inactivity, for testing. ↵srowen1-3/+3
Also break out some code from CaptureActivity to reduce its size. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1529 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-15Commit good fix for race condition Daniel notedsrowen1-1/+10
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1366 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-11Oops, bug from last patch. Need to make the Handler in run()srowen1-4/+8
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1298 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-11Unwind DecodeHandler out of DecodeThread to avoid a VerifyError ?srowen1-65/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1297 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-07Issue 376: re-set camera params after first auto-focus callback to make it ↵srowen1-0/+2
work on Droid. Along the way, did a very big reorganization of CameraManager since it was becoming spaghetti code git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1292 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-04Small thing, make log TAGs consistentsrowen1-1/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1275 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-09Issue 338srowen1-15/+14
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1206 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-09Issue 112srowen1-61/+11
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1204 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-01Pre-RSS-14 changes. Necessary code changes, but not the decoder. Committing ↵srowen1-2/+8
this since it does no harm and clears out my client so I can modify these files for other purposes. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1193 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-14Finished work on the local binarizer and renamed it to HybridBinarizer. It ↵dswitkin1-2/+2
uses the old histogram for 1D and the new approach for 2D. The unit tests don't fully demonstrate how much better this is in real-world lighting, but it pretty much solves the situation of pointing at a QR Code for 30 seconds without scanning, due to a shadow or gradient. HybridBinarizer is now the default across all the fast clients and the unit tests. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1157 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23Draft of 'thinking' visualization for barcode scanning. Works for 1D and QR ↵srowen1-34/+32
codes. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1125 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23Consolidated all the Android LuminanceSource classes into one file. Either a ↵dswitkin1-1/+1
device can be handled by this file, or the app won't work. The Android platform requires every device to support yuv420sp camera preview buffers, but we also let two other similar formats sneak in for compatibility. I also removed the ability to convert LuminanceSource data into ARGB images, which wasn't used. I also reverted a String-related change to QRCodeEncoder.java. The new method appears present in Java 1.6's String class but not in Android's. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1121 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-17Tiny speedupssrowen1-6/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1111 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-21Add history feature; group some functionality into subpackagessrowen1-3/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1058 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-11Lots of updates:dswitkin1-20/+17
- Added support for new YUYV preview buffer format. - Made the preview rectangle larger. - Added support for high resolution screens. - Updated for Donut but still runs on Cupcake. - Converted to standard Java coding style for member variables. - Added many comments and author tags. - Removed some Petit Four hacks and vestigial code. *** The app must be built with the Donut SDK from now on. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1049 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-26Refactored the MonochromeBitmapSource class hierarchy into LuminanceSource, ↵dswitkin1-8/+14
Binarizer, and BinaryBitmap classes. The unit tests pass and I believe the change is complete, but there are some clients like J2ME and Bug that I can't build. This change will allow new thresholding algorithms to be developed and tested, as well as implemented per platform if needed (e.g. in JNI on Android). It should also perform better when multiple 2D Readers are installed, because the underlying image will only be converted to 1 bit once. It also allows some platforms to return luminance data without a copy. The current state of this checkin is to use the old black point algorithm, which now lives in GlobalHistogramBinarizer. This will be our benchmark and fallback for slower platforms. Going forward we will begin to use LocalBlockBinarizer as I shake out the edge cases and tune it for performance. Currently it is unused. IMPORTANT: I have temporarily included three methods from MonochromeBitmapSource at the end of BinaryBitmap as a way to make this change in stages. They are deprecated and will be removed soon. All of the Reader classes will need to change the way they examine 1 bit pixels to use the new getBlackRow() and getBlackMatrix() calls. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@993 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-06-10Issue 155: allow custom product search, and, other small tweaks I think ↵srowen1-4/+4
nobody will yell at me for git-svn-id: http://zxing.googlecode.com/svn/trunk/android@967 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-05-21Stopped sending the decode duration in a message, which no one was looking ↵dswitkin1-2/+3
at, and logged it instead. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@943 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-14Fixed or removed a bunch of TODOs, and enforced the 100 columns limit in a ↵dswitkin1-2/+3
bunch of places. Also allowed QR Codes to be encoded of contacts without names. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@907 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-03-09Turned on ITF support in the Android client, and fixed a bug in the ITF ↵dswitkin1-1/+3
result points, which by convention should draw across the whole body of the barcode, not just the start range. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@881 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-12More reckless refactoring and code style tweaks -- mostly adding braces ↵srowen1-0/+1
around conditional/loops, and using @Override git-svn-id: http://zxing.googlecode.com/svn/trunk/android@784 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-12-09Small speedups in time-related codesrowen1-5/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@780 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-21Forced the Android client to only decode the existing 7 formats, thereby ↵dswitkin1-1/+15
excluding ITF for the time being. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@751 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-11Now attempts to use locale-specific Google property in client. Also made ↵srowen1-2/+2
some stuff final that can be. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@685 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-10Did a bunch of renaming, there was no need for the Barcodes prefix.dswitkin1-4/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@682 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-18The new Android client, featuring:dswitkin1-0/+167
- a completely new result UI with multiple actions per barcode - Search Book Contents, powered by Google Book Search - support for calendar events - support for URLs and addresses in contact info - many other small improvements, like making URLs hyperlinked git-svn-id: http://zxing.googlecode.com/svn/trunk/android@625 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-19The new 0.9 SDK Android client.dswitkin1-222/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@568 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-20Standardize and update all copyright statements to name "ZXing authors" as ↵srowen1-1/+1
suggested by open-source team to correctly attribute copyright in a project with contributions from several sources. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-02Many more little tweaks from IntelliJ inspectionssrowen1-0/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@382 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-22Merged revisions 321,327,330,332,334,342-343,352-353,355-358,361-363,365,372 ↵dswitkin1-0/+221
via svnmerge from https://zxing.googlecode.com/svn/trunk/android-m3 ........ r321 | srowen | 2008-03-28 09:57:55 -0700 (Fri, 28 Mar 2008) | 1 line Updates for 0.6; set aside a different android-m3-home variable for android-m3 build ........ r327 | srowen | 2008-03-31 12:04:38 -0700 (Mon, 31 Mar 2008) | 1 line Made the RGB to luminance approximation/optimization a little faster -- one less shift ........ r330 | dswitkin | 2008-03-31 13:55:38 -0700 (Mon, 31 Mar 2008) | 1 line Changed the project names for the two Android clients to disambiguate them. ........ r332 | dswitkin | 2008-04-01 09:11:36 -0700 (Tue, 01 Apr 2008) | 1 line Added some debugging features to the M3 Android client. You can now press 'C' to capture a photo, 'U' to decode only UPC/1D barcodes, and 'Q' to decode only QR Codes. ........ r334 | dswitkin | 2008-04-01 12:23:05 -0700 (Tue, 01 Apr 2008) | 1 line Added latency measurement in milliseconds to the Android client. ........ r342 | dswitkin | 2008-04-03 14:13:50 -0700 (Thu, 03 Apr 2008) | 1 line Improved the Android M3 viewfinder display, by making the framing box larger and zooming in. Also fixed a bug when restarting the activity where the camera params were stale. Fixed handling of geo and tel URIs. ........ r343 | srowen | 2008-04-03 15:18:16 -0700 (Thu, 03 Apr 2008) | 1 line Moved the "geo:" fix to the 'right' place ........ r352 | dswitkin | 2008-04-08 08:25:13 -0700 (Tue, 08 Apr 2008) | 1 line Rewrote the Android M3 client to do continuous decoding, which means you no longer have to push the shutter button. Now you can just place the barcode in the viewfinder and it will display the contents as soon as it decodes them. That also means you no longer get "barcode not found" error dialogs which is a big improvement. Also made sure that capturing debug JPEGs uses unique filenames. ........ r353 | dswitkin | 2008-04-08 09:06:13 -0700 (Tue, 08 Apr 2008) | 1 line Improved the CameraThread state machine, and fixed a bug where preview would not continue after capture. ........ r355 | dswitkin | 2008-04-10 13:57:37 -0700 (Thu, 10 Apr 2008) | 1 line Made sure the BitmapSource subclasses do not reuse a BitArray which is too small. ........ r356 | dswitkin | 2008-04-11 12:30:54 -0700 (Fri, 11 Apr 2008) | 1 line Changed ProGuard settings so it will inline methods which use private members. This eliminates tens of thousands of function calls to BitArray.get() on a typical decode, and lots of other work as well. Overall we're roughly 20% faster by using ProGuard than turning it off. ........ r357 | dswitkin | 2008-04-11 13:25:09 -0700 (Fri, 11 Apr 2008) | 1 line Made the worker threads shut down synchronously to fix a race condition where the CameraManager could close the camera driver too soon. ........ r358 | dswitkin | 2008-04-11 14:16:08 -0700 (Fri, 11 Apr 2008) | 1 line Added 'T' as a shortcut to toggle debug method tracing using android.os.Debug and traceview for analysis. The traces are written to /sdcard, which means the SD Card must not be mounted as a volume by USB at the time. Tracing can slow down decoding by a factor of 5 or more but gives very useful insights into where the time is going. ........ r361 | dswitkin | 2008-04-15 15:34:49 -0700 (Tue, 15 Apr 2008) | 1 line A couple small improvements to the CameraManager. ........ r362 | srowen | 2008-04-15 17:27:36 -0700 (Tue, 15 Apr 2008) | 1 line Small simplification of build file condition properties using else attribute ........ r363 | srowen | 2008-04-15 17:34:13 -0700 (Tue, 15 Apr 2008) | 1 line Fix Issue 50, not building on Windows, by adding some small workarounds for Windows paths in build files for Android ........ r365 | dswitkin | 2008-04-17 13:09:17 -0700 (Thu, 17 Apr 2008) | 1 line Converted the Android client to use a status bar on the bottom of the screen instead of dialogs for a much better, less interrupting user experience. ........ r372 | dswitkin | 2008-04-21 11:11:02 -0700 (Mon, 21 Apr 2008) | 1 line Added some simple sharpening for 1D decoding which allowed a couple more blackbox images to pass. There were a few cases where the format or content is now misdetected, but since the net gain was positive I decided to make those non-fatal errors. In real world use the sharpening seems to help, and I think we can do even better with a better algorithm. ........ git-svn-id: http://zxing.googlecode.com/svn/trunk/android@374 59b500cc-1b3d-0410-9834-0bbf25fbcc57