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
3404 commits 5 branches 32 tags 330 MiB
Commit graph

1102 commits

Author SHA1 Message Date
Miguel E. Hernández Cuervo 82861cd85d Merge branch 'master' of https://github.com/zxing/zxing 2015-02-12 09:08:25 -05:00
Miguel E. Hernández Cuervo 2c3e04e7ac Corrected Spanish "<history_empty_detail>". 2015-02-12 08:58:43 -05:00
fakhri626 ef74bb6a2c Update strings.xml 2015-02-01 20:15:02 +07:00
Sean Owen 894ab95ea0 Closes issue #302 : incorrectly remembers state from Intent after processing 2015-01-30 20:35:37 +00:00
Sean Owen c02bf4ca8e Fix javadoc 8 error 2015-01-30 18:18:32 +00:00
Sean Owen 563294b36e Fix unescaped quote in new translation and make translator escape quotes going forward 2015-01-30 17:08:37 +00:00
Sean Owen 9c4b8ed860 Update documentation of exported CSV format 2015-01-25 10:35:41 +00:00
Sean Owen 88c8f78a4f Follow up with translations for #296 2015-01-24 11:10:52 +00:00
MicheleMas f244a29c49 The history preference is now loaded at construction time 2015-01-23 15:12:11 +01:00
MicheleMas b783feae47 Fixed a typo in the IT strings.xml 2015-01-23 11:54:40 +01:00
MicheleMas 7c79a96bb0 Now history can be disabled 2015-01-23 11:40:25 +01:00
Sean Owen b1dabda5cf Introduce NO_REQUESTED_CAMERA 2015-01-08 09:52:44 +00:00
Mert Emin Kalender 8846890006 Remove unused open function from OpenCameraInterface 2015-01-08 00:16:44 -08:00
Mert Emin Kalender 5e76333708 Remove unnecessary branch in CameraManager 
OpenCameraInterface.open(id) function already deals with the negative case. So there is no need to have a branch based on camera id. This also removes the need for OpenCameraInterface.open() function.
 2015-01-08 00:13:16 -08:00
eliovir c4f5e7ef05 Update strings.xml 
Typo (unbreakable spaces before ":")
 2014-12-28 10:50:21 +01:00
Facundo Farias 9ff5db108b Reviewed ES translations, fixes minor typos 2014-12-21 14:28:58 +01:00
Sean Owen b8bafbe5c9 Update for Android 5; use Proguard 5 2014-10-21 18:05:08 +01:00
lskocik cd21205738 Libor Skočík - update - xml 
with spacing
 2014-10-20 15:13:17 +02:00
Sean Owen e3f2b0fb9f Exclude Android apps from Maven deploy 2014-08-20 12:33:21 +01:00
Sean Owen 58be32036a Remove exception on re-setting manual camera ID; this is fine and needed for an activity handling multiple Intents 2014-07-30 01:17:13 +01:00
Sean Owen 70b02ea882 Log final camera params 2014-07-27 15:18:50 +01:00
Sean Owen 8158984458 Support multiple "to", and CC and BCC, throughout the email result API. 2014-07-25 22:53:17 +01:00
Sean Owen db4bf8c255 Add check for null stream from ContentResolver when encoding 2014-07-14 15:17:01 +01:00
Sean Owen 8c93290921 Closes issue #184 : Add Thai translation 2014-07-07 08:43:09 +01:00
Sean Owen 6c2a9b016c Touch up whitespace and other small issues from inspection 2014-06-28 22:34:37 +01:00
Sean Owen 40b48a9163 Apps shouldn't refer to a SNAPSHOT as they are not released in the same way. Refer to last stable build. 2014-06-18 16:23:43 +01:00
Sean Owen 5069917c99 Fix unescaped apostrophe in French translation 2014-06-08 12:09:57 -04:00
Yahoe001 c1fb4e58f3 Update strings.xml 
Corrected as per Sean
 2014-06-03 20:15:03 -04:00
Yahoe001 9865768b81 Update strings.xml 
Corrected as per Sean.
 2014-06-03 17:50:16 -04:00
Yahoe001 c846061b68 Update strings.xml 
Review/correction and replacement of anglicisms in the translation
 2014-06-03 14:14:15 -04:00
Sean Owen 4e80efd7b1 Minor updates to nickname / birthday result changes 2014-05-25 14:06:13 +01:00
Thomas Weißschuh 28b5326397 [android] Website, Birthday and Nickname fields 
Only the first valid occurrence of Website and Birthday is used
 2014-05-23 17:47:46 +00: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 ab43ad3426 Fix typos in what's new 2014-05-22 07:56:08 +01:00
Sean Owen 049408e4ca Suppress two Android lint warnings 2014-05-22 07:33:07 +01:00
Sean Owen 081378fe93 Updates for BS 4.7.0 2014-05-16 13:42:02 +01:00
Sean Owen 1b403e81db Don't set FPS in main BS app, as it was for Glass and there is now a specialized Glass app 2014-05-16 13:10:29 +01:00
Sean Owen 5a07783224 Issue #142 : fix escaping of %f / %t 2014-05-10 16:19:46 +01:00
slepmog a9a417636f Fixed translation 2014-05-01 11:09:01 -07:00
slepmog c27808fc24 Fixed translation 2014-05-01 10:59:41 -07:00
slepmog b19a9106c9 Indentation wtf 2014-05-01 06:32:17 -07:00
slepmog 0b6d83ed10 Refactored open() into one method 2014-05-01 06:30:29 -07:00
slepmog 0d31475707 >= 0 2014-05-01 06:13:03 -07:00
slepmog 2b6c4ef71b + comments, >=0, IllegalStateException 2014-05-01 06:11:18 -07:00
slepmog e19e20b5dc Indentation wtf 2014-05-01 05:37:23 -07:00
slepmog 67217d4337 Indentation wtf 2014-05-01 05:36:44 -07:00
slepmog 5c840a5001 Indentation wtf 2014-05-01 05:34:55 -07:00
slepmog f80645c110 Amended onResume() to read CAMERA_ID from intent 2014-05-01 05:28:34 -07:00
slepmog e420079ad2 Indentation wtf 2014-05-01 05:24:44 -07:00
slepmog 6cb7147b44 Indentation wtf 2014-05-01 05:23:42 -07:00
slepmog 1cd8388b0c Added setManualCameraId() and amended openDriver() 2014-05-01 05:22:06 -07:00
slepmog f18b11d7d8 Added constant Intents.Scan.CAMERA_ID 2014-05-01 05:16:51 -07:00
slepmog 5b957c86f8 Added overload: open(cameraId) 2014-05-01 05:14:28 -07:00
Sean Owen 2209df1afa Also bump pom to 4.6.5 2014-04-30 15:12:38 +01:00
Sean Owen c1b1b63170 Refactor common code from across Android apps into module 2014-04-30 15:12:13 +01:00
Sean Owen f309e9a4cd Bump to BS 4.6.5 2014-04-23 12:51:27 +01:00
Sean Owen e130eac0ea Ensure beep MediaPlayer is released 2014-04-23 12:47:18 +01:00
Sean Owen 4050f5c2f3 Fix some issues flagged by Coverity static analysis 2014-04-22 22:20:58 +01:00
Sean Owen 002aa47e01 To be safe, avoid static DateFormat even in single-thread Android context 2014-04-22 18:44:17 +01:00
Sean Owen a9cf1e91ec Close ContentResolver InputStream 2014-04-22 18:40:55 +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 c2b7384286 Fix some Java 8 javadoc warnings 2014-04-13 13:11:00 +01:00
Sean Owen 0a65882eda Fix one more javadoc error for Java 8 2014-03-25 18:27:02 +00: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 df4d768e23 Suppress some lint warnings that are ignorable 2014-03-23 10:41:14 +00:00
Sean Owen 264a49a148 Issue #90 : possibly relevant improvement to logic - no point in canceling the AsyncTask which will always be running at that point if it exists 2014-03-20 17:07:42 +04:00
Sean Owen 9e8a47c7e4 Restore missing HE strings mistakenly omitted in last commit 2014-03-15 19:56:09 -07:00
Sean Owen 330589d376 Remove 2 unused Android app strings 2014-03-15 19:40:44 -07:00
Sean Owen 5a38cf6350 Back-port option to open web pages automatically. Off by default; use with caution. 2014-03-15 18:38:47 -07:00
Sean Owen 5a181630e0 Changes for 4.6.4 2014-03-15 10:46:32 -07:00
Sean Owen b27b6c3d55 Add new setting to freeze orientation on startup rather than switch between landscape orientations 2014-03-15 10:44:15 -07:00
Sean Owen c5837ebe81 Android apps handling orientation config change should apparenlty handle screenSize as well in API 13+ 2014-03-15 08:33:55 -07:00
Sean Owen 16ed2542fe Issue #80 : handle %t not %d escape 2014-03-15 08:14:13 -07:00
Sean Owen 7e419c28b1 4.6.3 what's new 2014-03-13 13:44:51 +00:00
Sean Owen d895a11bbe Merge branch 'AndroidMaven' 2014-03-08 00:22:15 +00:00
Sean Owen b94a980138 Issue #80 : address case where barcode text has a matching escape sequence, and better handle problematic case of URL escape sequences like %f2 matching the %f placeholder 2014-03-06 07:48:04 +00:00
Sean Owen 912bee4138 Issue #80 : validate custom search URL without placeholders, which will make URLs invalid in some cases 2014-03-05 22:11:29 +00:00
Sean Owen 08e7375c2c Experiment with building Android through Maven 2014-03-04 16:45:52 +00:00
Yao Wei (魏銘廷) 8d93ce85b3 fix zh-tw translations of whatsnew and new string 2014-02-28 21:38:42 +08:00
Sean Owen 097934091f Fix unescaping of entities in translator and touch up two typos in BS what's new notes 2014-02-28 10:34:12 +00:00
Sean Owen 01ae1deba6 Update BS notes for 4.6.2 2014-02-28 10:22:43 +00:00
Sean Owen 8eca74c664 Issue #36 : allow either landscape or reverse landscape based on sensor orientation 2014-02-26 14:19:23 +00:00
Sean Owen 68234e412d Issue #71 : add error message if custom search URL is invalid 2014-02-25 12:14:23 +00:00
Sean Owen c49c8dfa46 Make all the pref defaults in the code the same as defaults in XML, to be double safe, even though redundant 2014-02-25 11:14:10 +00:00
Sean Owen 39780fb86f Fix printing of FPS ranges in log messages 2014-02-12 23:31:36 +00:00
Yao Wei (魏銘廷) 78a6dcc336 fix zh_TW translation strings 2014-02-12 14:06:36 +08:00
Yao Wei 50378d2a7d Update strings.xml 2014-02-11 18:33:42 +08:00
Yao Wei ae6299c013 Update strings.xml 2014-02-11 18:33:28 +08:00
Yao Wei 924af48539 Update index.html 2014-02-11 18:25:53 +08:00
Yao Wei e40852e96d Update strings.xml 2014-02-11 18:24:35 +08:00
Yao Wei 729938a00e Update strings.xml 2014-02-11 18:22:26 +08:00
Yao Wei ba45d475ef Update strings.xml 2014-02-11 18:12:29 +08:00
Yao Wei 6f5fa3df2f Update about1d.html 2014-02-11 17:59:15 +08:00
Yao Wei fbcbb32e99 Update about2d.html 2014-02-11 17:59:01 +08:00
Yao Wei 4484e19e1f Update license.html 2014-02-11 17:58:30 +08:00
Yao Wei 888b5da5f3 Update license.html 2014-02-11 17:58:10 +08:00
Yao Wei f1884a05ba Update scanning.html 2014-02-11 17:57:37 +08:00
Yao Wei 7764a89732 Update sharing.html 2014-02-11 17:57:17 +08:00
Yao Wei 3e3a63715a Update sharing.html 2014-02-11 17:56:48 +08:00
Yao Wei b4421e3abc Update scanning.html 2014-02-11 17:48:40 +08:00
Yao Wei 93740a5e62 Update license.html 
Add a disclaimer for translated article.
 2014-02-11 17:37:24 +08:00
Yao Wei e5f11aa98c Update license.html 2014-02-11 17:35:02 +08:00
Yao Wei 6aecbffd9b Update index.html 2014-02-11 17:11:20 +08:00
Yao Wei 31193fb061 Update about1d.html 2014-02-11 17:05:08 +08:00
Yao Wei 35a3d52b5e Update about2d.html 2014-02-11 17:04:57 +08:00
Yao Wei 74713aaac7 Update about1d.html 2014-02-11 16:53:12 +08:00
Sean Owen b8fc4ebf16 Rewrite auto-focus loop to be more robust, like continuing even if camera driver errors 2014-02-09 11:10:01 -05:00
Sean Owen 091e614c20 Update text for next BS version 2014-02-09 11:02:15 -05:00
Sean Owen 92c70bd15d Avoid NPE on networks with no SSID 2014-02-09 09:40:51 -05:00
Sean Owen 4411eb5517 Drastic measures: make *all* optional camera params disabled by default to appease some bad devices. And even make the default disabled in the code, not just XML. 2014-02-03 22:27:00 +01:00
Sean Owen ac9b79953f Add new Aztec, PDF417 images for help 2014-02-01 22:48:09 +00:00
Sean Owen e3a3e0bde0 Missed some references to 4.6.0 in help files 2014-01-31 08:51:27 +00:00
Sean Owen 8c6246f12b Remove BS+ link in prefs 2014-01-31 08:42:46 +00:00
Sean Owen 72d01241f9 Prepare notes for BS 4.6.0 2014-01-29 14:10:23 +00:00
Sean Owen 8e2e0bc94d Use HTTPS to send product queries to Google Shopping 2014-01-28 08:08:04 +00:00
Sean Owen a8c9897da3 Issue #38 : extra defensive -- don't even assume the list is sorted in case of buggy phones 2014-01-24 20:23:16 +00:00
Sean Owen e174140d8d Back-port ability to control exposure, scene mode and metering. Latter two disabled by default. 2014-01-24 20:15:56 +00:00
Sean Owen 28f2a301c2 Issue #38 : Add minimum FPS to be safe 2014-01-24 09:37:34 +00:00
Sean Owen de6e9dbc52 Add defensive checks for bad setFPS API behavior 2014-01-24 08:12:57 +00:00
Paul Peavyhouse d1f5627551 Minimum change needed to get the camera working on Glass. 2014-01-23 15:37:19 -08:00
Sean Owen c1df162b95 Add apache-rat check for copyright headers, and fix a bunch of files without them (mostly actionscript, jruby) 2014-01-22 19:37:33 +00:00
Sean Owen 1fa90e7074 Remove Amazon results, per request 2014-01-21 18:25:06 +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 542319c18f Tiny differences to back port from review of diff with BS Plus 2014-01-19 00:54:33 +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 800fee3472 Add values-iw as symlink to values-he 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3015 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-14 15:48:35 +00:00
srowen 50ea24683e Remove values-iw to make it a symlink to values-h 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3014 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-14 15:46:47 +00:00
srowen ee68feb5ee Add zh-rHK as symlink to zh-rTW 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3013 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-14 15:45:23 +00:00
srowen dfd6fe71c2 Overhaul contact encoding in Android; encode phone type too 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3012 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-07 22:00:38 +00:00
srowen 3a570f696a No need to save state in HelpActivity 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3009 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-01 14:20:49 +00:00
srowen a0fcecfc96 Make most internal activities non-exported by removing uneeded intent-filter 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3008 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-01 13:56:34 +00:00
srowen caa4ee02d5 Fix problem on some platforms with AsyncTask array arg type 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3007 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2014-01-01 13:29:43 +00:00
srowen 7ead18d172 Add prefs to enable Aztec, PDF417 barcodes. Separate prefs for 1D product and 1D industrial formats. 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3006 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-30 16:42:34 +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 1b79e9748c Fix class description 
git-svn-id: https://zxing.googlecode.com/svn/trunk@3002 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-21 20:40:53 +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 f4329e7d15 Issue 1817 don't include name/title in map search 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2987 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-04 18:42:19 +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 3de3374dd2 Bump to BS 4.5.2 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2982 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-12-02 18:23:20 +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 e7400da79d Suppress one compile warning 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2933 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-29 14:18:41 +00:00
srowen@gmail.com 6cf76e3880 Final changes for 4.5.1 (not 4.6) 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2927 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-28 17:51:18 +00:00
srowen@gmail.com 28d33782a1 Only request default US results if local results are not found 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2924 59b500cc-1b3d-0410-9834-0bbf25fbcc57
 2013-11-25 09:17:43 +00:00