mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 05:27:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity
3027 commits 5 branches 32 tags 330 MiB
Commit graph

99 commits

Author SHA1 Message Date
Sean Owen b8bafbe5c9 Update for Android 5; use Proguard 5 2014-10-21 18:05:08 +01:00
Sean Owen e3f2b0fb9f Exclude Android apps from Maven deploy 2014-08-20 12:33:21 +01:00
Thomas Weißschuh 882f12d5fe fix version of parent project in subprojects 2014-05-23 17:47:38 +00:00
Sean Owen 3a322f9fb0 Pull project component dependency versions into parent 2014-05-22 08:17:32 +01:00
Sean Owen c103e59b7e Refactor logging of camera params 2014-05-01 00:01:44 +01:00
Sean Owen 35e13989af Android apps should be on 3.0.2-SNAPSHOT now 2014-04-21 23:50:16 +01:00
Sean Owen fabd9f6473 Minimal changes to build successfully with Java 8, plus optional profile to enable it 2014-03-25 18:01:01 +00:00
Sean Owen 08e7375c2c Experiment with building Android through Maven 2014-03-04 16:45:52 +00:00
Sean Owen ed760e2e6b Ignore a few more Android files 2014-01-20 17:37:52 +00:00
Sean Owen 59e4708cd7 Fix up .gitignore to ignore generated dirs, and remove generated dirs from git 2014-01-20 17:21:09 +00:00
Sean Owen 3f6ee7f789 Update project site references to Github 2014-01-18 14:06:46 +00:00
Sean Owen 3bd1c7c5ff Update .gitignores everywhere for IDEA files, etc 2014-01-17 11:13:30 +00:00
srowen e17d73cc9e Check in Android gen files and configure Android src roots in Maven 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3004 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-26 19:25:19 +00:00
srowen 5ae061602e Android modules need to express their dependencies on core/android-integration 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3003 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-26 18:49:07 +00:00
srowen fe555e001b Avoid NPE for camera with no params 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2995 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-17 15:11:33 +00:00
srowen da9d32846a Whitespace cleanup and other inspections from IDEA 13 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2989 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-06 11:17:57 +00:00
srowen@gmail.com 49e2bca2aa Add back symlinks at proguard config name that Android build expects 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2988 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-05 11:05:56 +00:00
srowen@gmail.com b2f2615b56 Standardize proguard config 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2985 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-03 09:23:46 +00:00
srowen@gmail.com a53c659b0e Boldly move to Java 7 for everything, including Android. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2981 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-02 18:18:46 +00:00
srowen@gmail.com 092e0e9572 Bump android/androidtest to 3.0.0 manually 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2976 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-29 23:02:33 +00:00
srowen@gmail.com e281559cc8 Manually bump android/androidtest modules to 2.3.0 since weren't enabled from parent 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2972 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-29 22:52:35 +00:00
srowen@gmail.com aa19cb25af Build Android apps, using Ant script, in compile phase in Maven 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2917 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-24 16:18:44 +00:00
srowen@gmail.com 06236f7a7f Update to reference latest SDK 19 / Android 4.4 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2903 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-01 03:27:28 +00:00
srowen@gmail.com b7188c4312 Additional changes for Android 4 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2881 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-09-02 06:05:31 +00:00
srowen@gmail.com 0d6eabd6fc Updates for Android 4+ 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2880 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-09-01 08:59:08 +00:00
srowen@gmail.com 1d086a09af Type weakening and dead code commenting again 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2876 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-08-26 17:27:54 +00:00
srowen@gmail.com e980a11f49 Remove some unneeded strings 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2853 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-07-30 11:10:14 +00:00
srowen@gmail.com 3b7081cc54 Update for Android API 18, latest SDK 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2848 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-07-25 06:10:01 +00:00
srowen@gmail.com bacf3467cf Small update for 4.4 beta 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2824 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-06-20 21:38:37 +00:00
srowen@gmail.com dcbc2e9bd6 Japanese translation updates from taku0 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2810 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-05-25 10:56:29 +00:00
srowen@gmail.com 20490f1bda Update ZXingTest to use Holo theme; requires Android 2.3.3 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2798 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-05-15 17:47:23 +00:00
srowen@gmail.com 44c6b383e3 Lint cleanup 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2704 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-05-02 10:13:23 +00:00
srowen@gmail.com 1f054946be Update to 1.2.1 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2703 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-05-02 09:39:28 +00:00
srowen@gmail.com 96c8b2a8b6 A few inspection cleanups 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2660 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-04-18 11:26:13 +00:00
srowen@gmail.com b01cff36fa Various changes from IJ12.1 inspections 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2581 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-03-01 20:01:40 +00:00
srowen cfbabe908b Use Android 4.2 SDK consitently; don't target it for apps though 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2518 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-11-13 21:18:11 +00:00
srowen 4aa2358e31 Move RGBLuminanceSource to core/ 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2389 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-08-14 09:23:23 +00:00
srowen 3e2b52fa38 Correctly parallelize AsyncTask threading on Honeycomb and beyond 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2381 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-08-07 09:21:12 +00:00
srowen 41d2082342 As far as I know, should be OK to express that we target 2.3.x but support 2.1 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2356 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-07-21 20:10:22 +00:00
srowen 8f461afd09 Let callers specify more extras to IntentIntegrator. Use it in test app, so we can use it in all cases, and avoid ActivityNotFoundException 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2260 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-04-26 16:22:24 +00:00
srowen 9f07c47941 Apparently some of the default disabled optimizations are only there for Donut 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2245 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-03-31 23:13:16 +00:00
srowen a670311585 Updated proguard.cfg to match new default for SDK 17 / Proguard 4.7 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2231 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-03-22 11:26:14 +00:00
dswitkin@google.com a157931333 Cleaned up the ZXing Test manifest to match the Barcode Scanner one. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2139 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2012-02-03 22:24:17 +00:00
srowen f2fe9dbd67 Added more metadata to the integrator 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2068 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-12-06 20:13:27 +00:00
srowen ac499ddaf6 Issue 876 add ability to customize prompt (and reshuffle a few items in CaptureActivity for clarity) 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2066 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-12-06 11:44:17 +00:00
dswitkin@google.com 77a9722e16 - Bumped the versionCode to one past 3.72. 
- Fixed the ij-install target which the new Android SDK broke.

git-svn-id: https://zxing.googlecode.com/svn/trunk@2043 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-17 19:19:55 +00:00
srowen 8198d32f53 Let Proguard work for release builds 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2039 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-16 23:51:06 +00:00
srowen f328cb618e Update ZXingTest to work on 3.x+, mostly by removing the camera capture bit for now. It can come back after android/ is updated and can be cloned again. Updated android-integration with better API and ability to specify package. Now ZXingTest uses our integration code. It's updated for Android 2.x and reports camera params in a slightly better form. Also fixed a few Android 2.x issues and related intent integration stuff left over from other recent changes. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2020 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-10 11:16:24 +00:00
dswitkin@google.com c79fb8474b Added build targets for IntelliJ which can't see the built-in Android targets. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2009 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-02 19:58:54 +00:00
srowen 79add84a5a Recreate build files for android, androidtest, for latest SDK 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2008 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2011-11-02 19:34:19 +00:00