summaryrefslogtreecommitdiff
path: root/src/com/google/zxing/client/android/CaptureActivity.java
AgeCommit message (Collapse)AuthorFilesLines
2011-11-02Update all Java code to use Java 6srowen1-29/+21
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@2002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-18Made some changes for Ice Cream Sandwich and bumped the versiondswitkin@google.com1-4/+20
to 3.7 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1978 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-10-14Guess at avoiding an NPE reported by a usersrowen1-4/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1970 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-08-02Issue 923 user supplied patch to remember supplemental info in historysrowen1-2/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1873 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-06-08- Prevented secure URIs from being added to History or copied to the clipboard.dswitkin@google.com1-12/+12
- Made the History display parsed entries instead of raw contents. - Some minor cleanup and comments. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1813 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-21A bunch of code style related changessrowen1-3/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1795 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-20Caught RuntimeException for Camera.startPreview() and put up an error ↵dswitkin@google.com1-5/+4
message. We were getting 135 reports a week about this. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1788 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-17Issue 835: Added support for specifying a width and height for the scanning ↵dswitkin@google.com1-0/+7
rectangle when launching Barcode Scanner by Intent. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1776 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-05-12Lots of code cleanup, including 100 column fixes and dead code removal.dswitkin1-4/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1769 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-04-29Issue 819 don't copy to clipboard if not saving history, when activated by ↵srowen1-1/+2
Intent git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1752 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-04-03Issue 787 inactivity timer battery checksrowen1-0/+3
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1734 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2011-03-09Issue 740 user-suggested patch to return bytessrowen1-0/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1724 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-12-15Style stuff mostly but fix a problem between Aztec and J2ME toosrowen1-7/+0
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1681 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-11-12Probably much better fix that Lachezar spotted -- LDPI layout wasn't ↵srowen1-8/+4
correctly updated by me git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1644 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-11-12WIth Lee (Wildfire owner) helping found the cause -- bizarre issue with ↵srowen1-4/+8
Wildfire where it can't find a UI element. Disabling it for these devices. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1642 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-10-13Add "retreive more info" feature -- resolves redirectors and gets first ↵srowen1-0/+8
product result inside the app git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1624 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-10-11Farm out beep/vibrate stuff to class to try to reduce CaptureActivity complexitysrowen1-69/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1621 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-08-13Issue 460, auto timeout of CaptureActivity after inactivity, for testing. ↵srowen1-77/+12
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-08-11Add result points for UPC EAN metadata extensionsrowen1-2/+11
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1519 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-07-21Final Barcode Scanner 3.4 changes:dswitkin@google.com1-2/+3
- Cleaned up the sharing UI - Removed a piece of black artwork - Fixed the Froyo bug with the Help screen appearing blank - Made external URLs in Help launch in the Browser - Updated some help text git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1491 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-30Make sure cancel is handled properly in a few cases, where app must exit ↵srowen1-5/+2
after dialog git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1466 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-30- Bumped version to 3.4 beta 1.dswitkin@google.com1-1/+1
- Fixed two crashes on low DPI devices because of missing/stale views in layout-ldpi/capture.xml. - Added support for apps on SD card on Froyo. - Updated SDK to 8. - Tweaked some font sizes. - Updated the What's New page. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1464 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-18- Made sure barcode scanning always restarts when the activity is resumed.dswitkin@google.com1-33/+21
- 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-06-17Add bulk scan mode with preference (and rearrange prefs a bit). Reorder main ↵srowen1-2/+19
strings file, add new pref string and remove probably-incorrect ellipses from Asian language translations git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1443 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-17Display possible country origin info on product scansrowen1-2/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1438 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16Add support for UPC/EAN +5 extensions, plus basic tests, and display the ↵srowen1-3/+35
content in Android client as metadata git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1436 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-16... and roll back a bit more to old status view, smaller text againsrowen1-6/+6
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1431 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15... and put back status text, in a simplified form?srowen1-6/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1430 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15Back to white backgrounds, somewhat smaller text in the result screen, ↵srowen1-5/+8
shorter Toast popup and doesn't interfere with help screen git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1429 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-15Rest of cosmetic changes -- simpler, black theme with easier-to-touch ↵srowen1-18/+5
buttons and consistent sizing, icons git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1426 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-14Better tweak to last change -- scale text size dynamicallysrowen1-0/+4
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1424 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-14Prettify scan result screen, I thinksrowen1-13/+5
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1423 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-31Go ahead and enable Code 93 in androidsrowen1-0/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1402 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-07One more time -- rationalize log levels, mostly downward, and pull out 1-2 ↵srowen1-1/+1
more statements git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1342 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-02Replace tabs with spaces ( part of accepting another big patch); fix one ↵srowen1-2/+2
failing test due to typo git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1326 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-30Slight tweak to last change -- parse MODE value even when there's no ↵srowen1-6/+6
SCAN_FORMATS. Also be extra paranoid about other call to String.split() git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1324 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-30Fixed a crash with using SCAN_FORMATS - Pattern.split() does not like null ↵dswitkin1-5/+8
as an argument. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1323 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-23Try to respect silent ringer settingsrowen1-0/+7
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1316 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-19Turn on RSS 14srowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1310 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-07Issue 376: re-set camera params after first auto-focus callback to make it ↵srowen1-0/+1
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-06Issue 370, allow custom response URLssrowen1-7/+39
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1286 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-03-30Ditch ugly "unknown" icon for standard project icon; tighten up barcode ↵srowen1-7/+4
image view settings a little, I believe, by putting them in capture.xml and in dip units git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1265 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-27Add timestamp to result screensrowen1-0/+9
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1261 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-21Oops, didn't intend to enable RSS-14srowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1250 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-21Another change for Issue 112srowen1-1/+2
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1249 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-06Made upgrades load the What's New page, while new installs load the default ↵dswitkin1-3/+5
help page. Also bumped the version to 3.21 beta 1. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1242 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-04Preliminary RSS-14 support. Not enabled yet in Android client.srowen1-1/+1
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1233 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-03-01Issue 336: set Intent flag to make sure task's launched activities don't ↵srowen1-0/+6
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-11Removed our custom share icon, which was only in low res, and replaced it ↵dswitkin1-1/+2
with the system one, which is available in hdpi too. git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1207 59b500cc-1b3d-0410-9834-0bbf25fbcc57
generated by cgit v1.2.3 (git 2.39.0) at 2026-11-03 20:35:55 +0300