Commit graph

47 commits

Author SHA1 Message Date
srowen ac32515cdd Need to not generate debug info in Android as well now in order to satisfy new Proguard and dex releases?
git-svn-id: https://zxing.googlecode.com/svn/trunk@1419 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-06-08 23:05:28 +00:00
srowen 391626bb76 Reinstate more optimization, but avoid disagreement with dex by properly disabling the controversial optimizations: field and method merging, mostly
git-svn-id: https://zxing.googlecode.com/svn/trunk@1365 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-05-15 11:28:01 +00:00
srowen e51dbb3c53 Use RSS14 on the command line; scan more lines since RSS14 stacked kind of needs this; fix VerifyError when RSS14 is enabled on Android
git-svn-id: https://zxing.googlecode.com/svn/trunk@1311 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-19 09:23:43 +00:00
srowen 3a415a4994 Fix small compile error in javame/, update for Java ME SDK 3.x layout, finally disentangle Proguard location from WTK
git-svn-id: https://zxing.googlecode.com/svn/trunk@1302 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-12 08:59:41 +00:00
srowen fa436845dd Use zipalign for debug, and reminder to use it after signing a release
git-svn-id: https://zxing.googlecode.com/svn/trunk@1296 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-04-10 22:15:18 +00:00
srowen 49601e62e5 Issue 112
git-svn-id: https://zxing.googlecode.com/svn/trunk@1204 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-02-09 09:14:16 +00:00
dswitkin 30c41e5182 Made Barcode Scanner builds runs clean first to prevent stale resources and build problems related to the state ProGuard leaves the class files in.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1183 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2010-01-10 14:57:24 +00:00
dswitkin 67280f4ced Reduced ProGuard passed from 7 to 4 since there was no additional benefit.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1132 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-12-03 16:04:51 +00:00
srowen c9175ecae2 Pull out optimize target so we can selectively disable ProGuard with -Dno-optimize
git-svn-id: https://zxing.googlecode.com/svn/trunk@1123 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-11-23 09:41:58 +00:00
srowen 0a26db6e5a Tiny clarification to build
git-svn-id: https://zxing.googlecode.com/svn/trunk@1082 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-10-22 18:55:27 +00:00
dswitkin 1c4fe60220 Unbroke the app after the big subpackage reshuffle of '09:
- Updated manifest entries.
- Made necessary classes public.
- Fixed ProGuard exclusions.
- Updated resource file class name.

git-svn-id: https://zxing.googlecode.com/svn/trunk@1065 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-28 16:07:20 +00:00
dswitkin e83cb0cef1 Final changes for Barcode Scanner 2.93.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1046 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-09-03 20:37:38 +00:00
srowen fff6624521 SImplified optimization a bit and made it more aggressive.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1044 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-08-28 13:31:16 +00:00
srowen 91d8e04d86 Re-enable ProGuard, and finally identified the workaround that seems to make 4.4 work with our code without a VerifyError
git-svn-id: https://zxing.googlecode.com/svn/trunk@1025 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-22 10:36:11 +00:00
dswitkin 9dc583f556 Set a camera parameter to force the flash off. Also fixed the uninstall build targets.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1024 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-21 21:36:33 +00:00
dswitkin d71c099313 Converted the Android client and the test app to use the Android 1.5 SDK, and to use a more efficient preview frame mechanism too. We now require devices to be running Cupcake or a newer version of the platform. This change temporarily removes the Proguard step, which Sean is going to add back.
git-svn-id: https://zxing.googlecode.com/svn/trunk@1023 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-07-21 19:33:25 +00:00
dswitkin 02f779cbee Fixed or removed a bunch of TODOs, and enforced the 100 columns limit in a bunch of places. Also allowed QR Codes to be encoded of contacts without names.
git-svn-id: https://zxing.googlecode.com/svn/trunk@907 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2009-04-13 21:20:11 +00:00
srowen 6d8febc69e git-svn-id: https://zxing.googlecode.com/svn/trunk@813 59b500cc-1b3d-0410-9834-0bbf25fbcc57 2009-01-03 14:30:45 +00:00
srowen 002d80eed2 Added note about dex's issue with post-optimization debug symbol table
git-svn-id: https://zxing.googlecode.com/svn/trunk@700 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-14 14:13:45 +00:00
dswitkin ef7c421a66 Fixed Search Book Contents when built under ProGuard.
git-svn-id: https://zxing.googlecode.com/svn/trunk@667 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-11-03 16:13:56 +00:00
dswitkin 1d8b533310 Fixed the Android client when using ProGuard. The ViewfinderView constructor is loaded dynamically by the XML view inflation code, which requires explicitly preserving it.
git-svn-id: https://zxing.googlecode.com/svn/trunk@654 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-30 15:41:52 +00:00
dswitkin 43e155804f Looks like -allowaccessmodification to ProGuard results in a bogus binary. It compiles, but the Dalvik verifier rejects it at runtime. I'm removing this flag for now, which means we lose inlining on some important getters and setters.
git-svn-id: https://zxing.googlecode.com/svn/trunk@652 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 20:38:33 +00:00
dswitkin 1e478df248 Added androidtest to the top-level clean target and set it up for ProGuard too. Made both Android builds depend on clean so they work when switching between normal and ProGuard builds, and made install and reinstall use the latest binary instead of recompiling.
git-svn-id: https://zxing.googlecode.com/svn/trunk@651 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 20:13:05 +00:00
dswitkin 77f41cce22 Added another target for building a debug key signed Android client, and removed the old optimized target from core.
git-svn-id: https://zxing.googlecode.com/svn/trunk@650 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 19:50:37 +00:00
srowen 6f6da9a04c moved ProGuard optimization into Android build file since it's the only way to fully optimize the final build product (inlining of key methods). Also always dump proguard results.
git-svn-id: https://zxing.googlecode.com/svn/trunk@649 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-29 15:42:22 +00:00
dswitkin 35115ce1f3 The new Android client, featuring:
- 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: https://zxing.googlecode.com/svn/trunk@625 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-10-18 16:23:24 +00:00
dswitkin fecaba26de The new 0.9 SDK Android client (for real this time).
git-svn-id: https://zxing.googlecode.com/svn/trunk@569 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-19 19:14:09 +00:00
dswitkin b8eef13b00 Deleted the M5 Android client in preparation for an up-to-date version for the 0.9 SDK.
git-svn-id: https://zxing.googlecode.com/svn/trunk@567 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-08-19 16:26:01 +00:00
srowen e0db8f9271 Standardize and update all copyright statements to name "ZXing authors" as suggested by open-source team to correctly attribute copyright in a project with contributions from several sources.
git-svn-id: https://zxing.googlecode.com/svn/trunk@455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-06-19 20:56:24 +00:00
dswitkin 6291508a2e Merged revisions 378,380,382 via svnmerge from
https://zxing.googlecode.com/svn/trunk/android-m3

........
  r378 | dswitkin | 2008-04-28 21:27:27 -0400 (Mon, 28 Apr 2008) | 4 lines
  
  - Added Joseph's excellent supermarket checkout beep. There seems to be a bug in the M3 framework where it sometimes plays twice or hiccups.
  - Changed the status bar to flash green for a second when the result points are drawn.
  - Added install as a target to the build file.
  - Fixed a crashing bug when decoding from preview mode (driver problem).
........
  r380 | srowen | 2008-05-02 14:39:03 -0400 (Fri, 02 May 2008) | 2 lines
  
  Added preliminary support for MobileTag formats; not enabled yet.
  Added "sms:" URI support.
........
  r382 | srowen | 2008-05-02 15:18:14 -0400 (Fri, 02 May 2008) | 1 line
  
  Many more little tweaks from IntelliJ inspections
........


git-svn-id: https://zxing.googlecode.com/svn/trunk@384 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-05-03 16:10:16 +00:00
dswitkin 1d2f419d38 Fixed a typo in the Android build file.
git-svn-id: https://zxing.googlecode.com/svn/trunk@375 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-21 23:16:48 +00:00
dswitkin f59ed95541 Merged revisions 321,327,330,332,334,342-343,352-353,355-358,361-363,365,372 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: https://zxing.googlecode.com/svn/trunk@374 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-21 22:44:40 +00:00
srowen aa5cdcb64b Fix Issue 50, not building on Windows, by adding some small workarounds for Windows paths in build files for Android
git-svn-id: https://zxing.googlecode.com/svn/trunk@363 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-16 00:34:13 +00:00
srowen d2a240220c Small simplification of build file condition properties using else attribute
git-svn-id: https://zxing.googlecode.com/svn/trunk@362 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-04-16 00:27:36 +00:00
dswitkin 4b0927626f Changed the project names for the two Android clients to disambiguate them.
git-svn-id: https://zxing.googlecode.com/svn/trunk@330 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-31 20:55:38 +00:00
srowen 10ce9dde67 Updates to build on M5
git-svn-id: https://zxing.googlecode.com/svn/trunk@320 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-28 16:54:29 +00:00
srowen c32827af04 More aggressive inlining, to inline some key methods like BitArray.get(), resulting in significant performance boost
git-svn-id: https://zxing.googlecode.com/svn/trunk@311 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-25 18:23:49 +00:00
srowen b88df41dca More aggressive ProGuard optimization
git-svn-id: https://zxing.googlecode.com/svn/trunk@307 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-21 12:46:00 +00:00
srowen 8c105d8fc4 Automatically inserts version number in strings.xml now
git-svn-id: https://zxing.googlecode.com/svn/trunk@302 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-19 20:23:10 +00:00
srowen 7214289cf0 Oops, use 5 passes of optimization
git-svn-id: https://zxing.googlecode.com/svn/trunk@294 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-03-18 16:56:12 +00:00
srowen 759bef6f8a More little tweaks to make the 'release' build target happy again
git-svn-id: https://zxing.googlecode.com/svn/trunk@227 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 19:32:35 +00:00
srowen e8553801b1 Now can use "-Ddebug=true" on the command line to build a non-optimized build with debug symbols. Also added check for ProGuard.
git-svn-id: https://zxing.googlecode.com/svn/trunk@222 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 18:13:00 +00:00
srowen 556225ab0a Improved GridSampler API -- no need for reflection anymore. Reintroduced Android GridSampler implementation, which still doesn't quite work yet.
git-svn-id: https://zxing.googlecode.com/svn/trunk@221 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-22 17:01:38 +00:00
srowen 2110c3fbdd Added ProGuard
git-svn-id: https://zxing.googlecode.com/svn/trunk@217 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-21 16:36:27 +00:00
srowen e7cdb0ca25 Include android in main build; add android clean target
git-svn-id: https://zxing.googlecode.com/svn/trunk@194 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 21:06:57 +00:00
srowen eb2fa80eaf Biiig standardization of whitespace. 2 space indents now, no tabs.
git-svn-id: https://zxing.googlecode.com/svn/trunk@191 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 20:25:54 +00:00
srowen c36a3b64cc Added android build.xml file
git-svn-id: https://zxing.googlecode.com/svn/trunk@190 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2008-02-14 20:21:33 +00:00