diff options
| author | alpbak <alpaslanbak@gmail.com> | 2017-09-15 10:03:10 +0300 |
|---|---|---|
| committer | alpbak <alpaslanbak@gmail.com> | 2017-09-15 10:03:10 +0300 |
| commit | e48229ac3f47318e4b5516c645147d7dea37dc28 (patch) | |
| tree | 86ecb0ac6d875ca23970318a0a58897f45ba22ad /sample/src/main/java | |
| parent | 2ff44f91b5afa9e527e3cae63a9181d88652b126 (diff) | |
| download | zxing-android-embedded-e48229ac3f47318e4b5516c645147d7dea37dc28.tar.xz | |
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
Diffstat (limited to 'sample/src/main/java')
| -rw-r--r-- | sample/src/main/java/example/zxing/MainActivity.java | 3 |
1 files changed, 0 insertions, 3 deletions
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); |