From 2ff44f91b5afa9e527e3cae63a9181d88652b126 Mon Sep 17 00:00:00 2001 From: alpbak Date: Fri, 15 Sep 2017 09:45:19 +0300 Subject: Revert "Added a mixed scan mode to enable scanning inverted and normal barcodes" This reverts commit cf4c0dce50e56de1ac17869182621af50c009cac. --- sample/src/main/java/example/zxing/MainActivity.java | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sample/src/main/java') diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java index 22eda821..2e5a0f62 100644 --- a/sample/src/main/java/example/zxing/MainActivity.java +++ b/sample/src/main/java/example/zxing/MainActivity.java @@ -37,12 +37,15 @@ public class MainActivity extends AppCompatActivity { integrator.initiateScan(); } +<<<<<<< HEAD public void scanMixedBarcodes(View view){ IntentIntegrator integrator = new IntentIntegrator(this); integrator.addExtra(Intents.Scan.SCAN_TYPE, Intents.Scan.MIXED_SCAN); integrator.initiateScan(); } +======= +>>>>>>> parent of cf4c0dc... Added a mixed scan mode to enable scanning inverted and normal barcodes public void scanBarcodeCustomLayout(View view) { IntentIntegrator integrator = new IntentIntegrator(this); integrator.setCaptureActivity(AnyOrientationCaptureActivity.class); -- cgit v1.2.3