From e48229ac3f47318e4b5516c645147d7dea37dc28 Mon Sep 17 00:00:00 2001 From: alpbak Date: Fri, 15 Sep 2017 10:03:10 +0300 Subject: Revert "Added a mixed scan mode to enable scanning inverted and normal barcodes" This reverts commit cf4c0dce50e56de1ac17869182621af50c009cac. # Conflicts: # sample/src/main/java/example/zxing/MainActivity.java # zxing-android-embedded/src/com/google/zxing/client/android/Intents.java # zxing-android-embedded/src/com/journeyapps/barcodescanner/DecoratedBarcodeView.java # zxing-android-embedded/src/com/journeyapps/barcodescanner/DefaultDecoderFactory.java --- sample/src/main/java/example/zxing/MainActivity.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'sample/src/main/java/example/zxing/MainActivity.java') diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java index 2e5a0f62..22eda821 100644 --- a/sample/src/main/java/example/zxing/MainActivity.java +++ b/sample/src/main/java/example/zxing/MainActivity.java @@ -37,15 +37,12 @@ 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