| 
							
							
								 Jacob Hargrave | 38721b19b2 | Increasing the autoFocusInterval, so that it allows slower devices such as the Galaxy S3, to finish focusing before it tries to refocus. Before this change it was appearing as if the autofocus wasn't working at all, because it kept resetting the focus before it got a chance to focus. | 2016-04-22 13:32:28 +10:00 |  | 
			
				
					| 
							
							
								 Jacob Hargrave | 57dcc5f9dc | - fixing orientation of camera viewport for Android Nexus 5x devices | 2016-04-22 13:32:27 +10:00 |  | 
			
				
					| 
							
							
								 Jacob Hargrave | 86f2ba77f7 | Adding files for Android 6 Marshmallow compatibility and 64 bit devices, such as the Nexus 5x. Fixes issue # 50 https://github.com/tjwoon/csZBar/issues/50 | 2016-04-22 13:32:09 +10:00 |  | 
			
				
					| 
							
							
								 Micael Teweldemedhin | dfbb5fa400 | Camera Flash icon added | 2016-04-22 13:32:09 +10:00 |  | 
			
				
					| 
							
							
								 micaTewe | 35eb284ca2 | Android barcode layout changes | 2016-04-22 13:32:09 +10:00 |  | 
			
				
					| 
							
							
								 micaTewe | 9a365ce13c | Button to activate flash Adding button to activate/deactivate flash during the capturing the phase. | 2016-04-22 13:32:07 +10:00 |  | 
			
				
					| 
							
							
								 Daniel Cousens | c80f254496 | Merge pull request #62 from tjwoon/noflashingflash Resolve alternating flash during autofocus | 2016-04-21 14:28:15 +10:00 |  | 
			
				
					| 
							
							
								 Daniel Cousens | 507444ffd0 | Resolve alternating flash during autofocus | 2016-04-13 12:06:23 +10:00 |  | 
			
				
					| 
							
							
								 Bar Tsoury | 5c144a7961 | update so files to be compatible with android M (23) | 2016-01-11 14:50:40 +02:00 |  | 
			
				
					| 
							
							
								 TJ Woon | a70a9bcb03 | Pull Request cleanup (#16): Reinstated old interval autofocus bahaviour on Android API Level < 14 (plus minor blank line formatting) | 2015-04-19 23:58:45 +08:00 |  | 
			
				
					| 
							
							
								 TJ Woon | fc6e2ff07c | Pull Request cleanup (#16): Removed redundant BarcodeFormat class | 2015-04-19 23:54:40 +08:00 |  | 
			
				
					| 
							
							
								 Nick German | 2b738063ef | renamed BarcodeFormat to ZBarcodeFormat, fixed indentation and added sdk check for continuous focus | 2015-04-13 10:27:24 +10:00 |  | 
			
				
					| 
							
							
								 Nick German | 80a3632a15 | Merge branch 'master' of https://github.com/nickgerman/csZBar Conflicts:
	android/ZBarScannerActivity.java
	android/res/layout/cszbarscanner.xml
	plugin.xml | 2015-03-26 07:27:36 +10:00 |  | 
			
				
					| 
							
							
								 Nick German | bb3b82aace | Android now uses auto focus, assigns and enables all barcode types | 2015-03-26 07:22:39 +10:00 |  | 
			
				
					| 
							
							
								 TJ Woon | ff4c716e46 | Re-added Paolo's Android autofocus crash fix (see 633b5f7) | 2015-02-27 18:56:31 +08:00 |  | 
			
				
					| 
							
							
								 TJ Woon | 2a8a237a97 | Reverted Android layout and Activity changes back to original with addition of simple sight line There was no need to completely change our implementation and remove
the top and bottom text views | 2015-02-27 18:28:16 +08:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 633b5f7b54 | Manage onAutoFocus Android Manage onAutoFocus Android | 2015-02-03 10:43:31 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 6ae4faaf3a | Android default drawSight = true Android default drawSight = true | 2015-01-23 14:31:50 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 98cf6c7bec | Android bugfix android bugfix | 2015-01-23 11:49:57 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 817b5d0ffa | Commit relative layout Commit relative layout | 2015-01-23 11:20:12 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 0d9a53e476 | Android, line sight landscape Adding a line sight landscape | 2015-01-23 10:02:38 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 76630c9c45 | android autofocus fix Adding camera.cancelAutoFocus(); some devices crashes | 2015-01-21 14:26:33 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 2d02b70c07 | Android fix Fix android release | 2015-01-16 15:44:36 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 790704f750 | Commit Android Commit Android Label and rect sight removing | 2015-01-16 12:12:39 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 9d94500548 | Bug fix Continuos auto focus fix for sony device | 2014-12-23 16:06:44 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | cc4343209f | Bug fix Cynogen camera auto focus bug | 2014-12-23 15:27:24 +01:00 |  | 
			
				
					| 
							
							
								 PaoloMessina | 76246b80ed | iOS & Android fix and upgrade iOS:
- x86_64 header fixing
- sight adding
Android:
- Bug fix no params NullPointerException
- sight adding | 2014-12-22 14:59:52 +01:00 |  | 
			
				
					| 
							
							
								 Woon Tien Jing | 5ca1e07d9e | Documented Android flash:"on" quirk after finding out that setting focus mode to CONTINUOUS_PICTURE or CONTINUOUS_VIDEO actually gave poorer results (flash only turned on during the first autofocus attempt, if at all - may be device dependent) | 2014-12-06 17:32:54 +08:00 |  | 
			
				
					| 
							
							
								 Woon Tien Jing | 0b0699f7b4 | Added an option for camera flash to be on/off/auto during QR code scanning | 2014-12-06 16:58:46 +08:00 |  | 
			
				
					| 
							
							
								 Woon Tien Jing | 889be2cc3a | Removed all whitespace-only lines from the source code to stop myself from going crazy... | 2014-12-06 16:40:14 +08:00 |  | 
			
				
					| 
							
							
								 Woon Tien Jing | 4ef4dfb51f | Added front/back camera option | 2014-12-06 16:38:00 +08:00 |  | 
			
				
					| 
							
							
								 Woon Tien Jing | 8d0261b650 | Added text_title and text_instructions parameters for customising the scanner view's title and instructions texts (Android only in this commit) | 2014-12-06 15:40:17 +08:00 |  | 
			
				
					| 
							
							
								 TJ Woon | 1b6217e73d | Added initial Android implementation (with plugin.xml and JS interface) | 2014-09-11 15:52:59 +08:00 |  |