summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/CaptureActivity.java
AgeCommit message (Expand)AuthorFilesLines
2013-07-09Handle NPE when scanning PDF417 barcodes.Ralf Kistner1-1/+3
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner1-16/+47
2013-04-27Avoid weird NPE and don't obfuscate anymore -- no needsrowen@gmail.com1-5/+7
2013-04-15By request, let's show a bit of the scanned string when scanning by Intent in...srowen@gmail.com1-4/+5
2013-03-29First cut at specifying hints by Intent from Lachezarsrowen@gmail.com1-1/+6
2013-01-20Try to avoid another clipboard-related NPEsrowen1-1/+6
2013-01-20On scan we pass a grayscale image of the scanned image, which is used as a th...srowen1-9/+15
2012-12-14Namespace some resources to prevent conflicts.Ralf Kistner1-4/+4
2012-11-29Remove unused code and assets.Ralf Kistner1-196/+8
2012-11-29Replace the about dialog with a stripped-down version of the original help sc...Ralf Kistner1-20/+3
2012-11-29Work around a weird NPE inside the clipboard librarysrowen1-1/+6
2012-11-28Remove ZXing menu options and add a basic about dialog.Ralf Kistner1-30/+17
2012-11-28Initial preparation for use as a library project.Ralf Kistner1-19/+15
2012-11-20Also use application context with Toast consistentlysrowen1-1/+1
2012-11-09Issue 1425 add more placeholders to fill in in the URL specified in the scan-...srowen1-22/+7
2012-11-09Possibly final changes for automatic torch settingssrowen1-2/+2
2012-11-08Infrastructure for automated torch on based on ambient light (not turned on yet)srowen1-0/+4
2012-10-11Issue 1404 show result correctly from history in bulk modesrowen1-3/+5
2012-09-26Don't beep/vibrate when choosing item from historysrowen1-1/+2
2012-09-12Suppress status message on Intent scan if result duration is requested to be 0srowen1-9/+17
2012-09-10Merge About into Help. Clean up Help a little. Auto-translate into common lan...srowen1-25/+0
2012-09-10Remove hard-coded colors as step towards importing Holo theme; remove borders...srowen1-6/+0
2012-08-07Use AsyncTask in network, supplemental info task. Fix product search scrape.srowen1-1/+0
2012-07-31Maybe avoid one more NPEsrowen1-1/+3
2012-07-22Use menu resource instead of hard-codingsrowen1-31/+9
2012-06-29Fix a few possible rare NPEssrowen1-1/+4
2012-06-06Defensive change against late callbacks; not clear it's actually any issuesrowen1-0/+4
2012-05-10Now can turn light on/off with volume buttonssrowen1-10/+21
2012-04-25Add a double-check for null SurfaceHoldersrowen1-0/+3
2012-04-06Issue 1236 let history answer an Intentsrowen1-30/+30
2012-03-15Issue 1213 add 'raw' param to send back raw barcode text not processed formsrowen1-9/+12
2012-03-14Issue 1215 clear a little redundant codesrowen1-2/+0
2012-02-15Send through EAN extension with metadatasrowen1-0/+4
2012-02-10Show barcode in bulk message toastsrowen1-1/+3
2012-01-21(undo one unintentional change)srowen1-1/+1
2012-01-20Remove defunct 'buggy' message for 4.0 from HelpActivity. And add the other h...srowen1-1/+33
2012-01-10Reimplement History as a simple activity instead of dialog; add ability to de...srowen1-2/+7
2012-01-02Actually use CheckboxPreference defaults in preferences.xml!srowen1-0/+2
2011-12-23Issue 918 Add MECARD/vCard switch after factoring out and tidying some of the...srowen1-5/+5
2011-12-17Matching Issue 414 / commit 2088 change to iPhone: support zxing://scan/... U...srowen1-2/+14
2011-12-13Improve wifi message and return to scan after; a few string cleanups toosrowen1-8/+9
2011-12-11Minor refinements to prep for history changesrowen1-1/+3
2011-12-06Issue 876 add ability to customize prompt (and reshuffle a few items in Captu...srowen1-26/+42
2011-12-06Issue 393 add intent extra to control delay after scan by intentsrowen1-32/+36
2011-11-28Issue 1079 return metadata like byte segments and more in Intent extras; add ...srowen1-0/+20
2011-11-15Fix some camera-related crashes on 3.71 that we may need to also put out a ba...srowen1-1/+6
2011-11-15Issue 1061 URL-escape {CODE} replacementsrowen1-2/+9
2011-11-04Real fix for Issue 1044 - don't use static CameraManagersrowen1-12/+13
2011-11-02Update all Java code to use Java 6srowen1-29/+21
2011-10-18Made some changes for Ice Cream Sandwich and bumped the versiondswitkin@google.com1-4/+20