summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/CaptureActivity.java
AgeCommit message (Collapse)AuthorFilesLines
2014-05-16Move library into a subfolder.Ralf Kistner1-564/+0
2014-05-16Modify and merge #10.Ralf Kistner1-18/+33
2013-07-09Handle NPE when scanning PDF417 barcodes.Ralf Kistner1-1/+3
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner1-16/+47
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-04-27Avoid weird NPE and don't obfuscate anymore -- no needsrowen@gmail.com1-5/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2698 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-04-15By request, let's show a bit of the scanned string when scanning by Intent ↵srowen@gmail.com1-4/+5
in the Toast popup git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2656 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-29First cut at specifying hints by Intent from Lachezarsrowen@gmail.com1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2599 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-01-20Try to avoid another clipboard-related NPEsrowen1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2564 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-01-20On scan we pass a grayscale image of the scanned image, which is used as a ↵srowen1-9/+15
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-12-14Namespace some resources to prevent conflicts.Ralf Kistner1-4/+4
Also removed some unused resources.
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 ↵Ralf Kistner1-20/+3
screen.
2012-11-29Work around a weird NPE inside the clipboard librarysrowen1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2539 59b500cc-1b3d-0410-9834-0bbf25fbcc57
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
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.
2012-11-20Also use application context with Toast consistentlysrowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2525 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-09Issue 1425 add more placeholders to fill in in the URL specified in the ↵srowen1-22/+7
scan-from-webpage mechanism git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2507 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-09Possibly final changes for automatic torch settingssrowen1-2/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2506 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-11-08Infrastructure for automated torch on based on ambient light (not turned on yet)srowen1-0/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2504 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-10-11Issue 1404 show result correctly from history in bulk modesrowen1-3/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2453 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-09-26Don't beep/vibrate when choosing item from historysrowen1-1/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2412 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-09-12Suppress status message on Intent scan if result duration is requested to be 0srowen1-9/+17
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2406 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-09-10Merge About into Help. Clean up Help a little. Auto-translate into common ↵srowen1-25/+0
languages. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2401 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-09-10Remove hard-coded colors as step towards importing Holo theme; remove ↵srowen1-6/+0
borders to match Holo git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2399 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-08-07Use AsyncTask in network, supplemental info task. Fix product search scrape.srowen1-1/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2375 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-31Maybe avoid one more NPEsrowen1-1/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2364 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-07-22Use menu resource instead of hard-codingsrowen1-31/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2357 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-06-29Fix a few possible rare NPEssrowen1-1/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2335 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-06-06Defensive change against late callbacks; not clear it's actually any issuesrowen1-0/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2303 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-05-10Now can turn light on/off with volume buttonssrowen1-10/+21
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2286 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-25Add a double-check for null SurfaceHoldersrowen1-0/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2258 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-04-06Issue 1236 let history answer an Intentsrowen1-30/+30
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2250 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-15Issue 1213 add 'raw' param to send back raw barcode text not processed formsrowen1-9/+12
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2229 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-03-14Issue 1215 clear a little redundant codesrowen1-2/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2226 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-02-15Send through EAN extension with metadatasrowen1-0/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2186 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-02-10Show barcode in bulk message toastsrowen1-1/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2177 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-21(undo one unintentional change)srowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2126 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-20Remove defunct 'buggy' message for 4.0 from HelpActivity. And add the other ↵srowen1-1/+33
half of new History impl that I forgot git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2125 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-10Reimplement History as a simple activity instead of dialog; add ability to ↵srowen1-2/+7
delete one entry with a long press git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2106 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-01-02Actually use CheckboxPreference defaults in preferences.xml!srowen1-0/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2101 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-23Issue 918 Add MECARD/vCard switch after factoring out and tidying some of ↵srowen1-5/+5
the contact encoding logic git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2097 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-17Matching Issue 414 / commit 2088 change to iPhone: support zxing://scan/... ↵srowen1-2/+14
URLs too git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2091 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-13Improve wifi message and return to scan after; a few string cleanups toosrowen1-8/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2081 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-11Minor refinements to prep for history changesrowen1-1/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2079 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-06Issue 876 add ability to customize prompt (and reshuffle a few items in ↵srowen1-26/+42
CaptureActivity for clarity) git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2066 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-12-06Issue 393 add intent extra to control delay after scan by intentsrowen1-32/+36
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2065 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-28Issue 1079 return metadata like byte segments and more in Intent extras; add ↵srowen1-0/+20
raw bytes to intent integrator code git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2053 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-15Fix some camera-related crashes on 3.71 that we may need to also put out a ↵srowen1-1/+6
back-ported fix for git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2036 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-15Issue 1061 URL-escape {CODE} replacementsrowen1-2/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2034 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-04Real fix for Issue 1044 - don't use static CameraManagersrowen1-12/+13
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2013 59b500cc-1b3d-0410-9834-0bbf25fbcc57
generated by cgit v1.2.3 (git 2.39.0) at 2026-11-03 15:27:55 +0300