summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/CaptureActivityHandler.java
AgeCommit message (Collapse)AuthorFilesLines
2013-07-09Merge branch 'upstream-2.2'Ralf Kistner1-5/+18
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-1/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2599 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-03-02Various changes from IJ12.1 inspectionssrowen@gmail.com1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-01-22Don't use inMutable, which is only in API 11+srowen1-3/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2565 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2013-01-20On scan we pass a grayscale image of the scanned image, which is used as a ↵srowen1-3/+13
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-28Initial preparation for use as a library project.Ralf Kistner1-52/+50
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-10-22Issue 1409 also include Chrome in code to reuse browser tabsrowen1-2/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2479 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-10-22Issue 1409 try to reuse browser tab on Intent replysrowen1-1/+22
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2464 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-10-04Issue 1392 log and warn about bad return URLssrowen1-1/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2448 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2012-05-10Back-port rewritten auto-focus cycle; allow disabling of auto focussrowen1-9/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2285 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-04Real fix for Issue 1044 - don't use static CameraManagersrowen1-11/+12
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2013 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-03More for Issue 1044 -- avoid another possible NPE though I don't think the ↵srowen1-1/+4
underlyling issue has been found yet git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2010 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-11-02Update all Java code to use Java 6srowen1-3/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-09-15Minor changes from code inspection resultssrowen1-0/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1589 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-18- Made sure barcode scanning always restarts when the activity is resumed.dswitkin@google.com1-9/+6
- Fixed a potential ANR - we can never sleep on the main thread. - Bumped the version number. - Minor cleanup and 100 columns fixes. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1447 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-07One more time -- rationalize log levels, mostly downward, and pull out 1-2 ↵srowen1-5/+5
more statements git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-06OK a little too much logging, roll some backsrowen1-1/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1338 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-05Added some log statement to help track down Acer issuesrowen1-0/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1337 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-07Issue 376: re-set camera params after first auto-focus callback to make it ↵srowen1-0/+3
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-03-01Issue 336: set Intent flag to make sure task's launched activities don't ↵srowen1-1/+3
stay on top when returning to BS. Doing this for all Intents for now git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1230 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-09Issue 338srowen1-1/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1206 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-09Issue 112srowen1-2/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1204 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23Draft of 'thinking' visualization for barcode scanning. Works for 1D and QR ↵srowen1-3/+5
codes. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1125 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-21Add history feature; group some functionality into subpackagessrowen1-4/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1058 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-11Lots of updates:dswitkin1-25/+26
- 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-05-01Final changes for v2.7 of Barcode Scanner, including sending product lookups ↵dswitkin1-2/+6
to the mobile version of Google Product Search. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@923 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-11-11Now attempts to use locale-specific Google property in client. Also made ↵srowen1-1/+1
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-0/+111
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@682 59b500cc-1b3d-0410-9834-0bbf25fbcc57
generated by cgit v1.2.3 (git 2.39.0) at 2026-10-04 13:07:30 +0300