summaryrefslogtreecommitdiff
path: root/sample/src/main/java/example/zxing/MainActivity.java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@embarkmobile.com>2015-06-21 15:53:20 +0300
committerRalf Kistner <ralf@embarkmobile.com>2015-06-21 15:53:20 +0300
commit9c75630305e91e0f09a65a41fcece57c5a2af449 (patch)
tree12b87c1450a1115712a733ded72a2a5d6d6c10bb /sample/src/main/java/example/zxing/MainActivity.java
parentd8648583f8c2a172790959f8ca68cdbc60ccbb53 (diff)
parentc32a34e0e5b493f5081dbb46526b7412b2a13a19 (diff)
downloadzxing-android-embedded-9c75630305e91e0f09a65a41fcece57c5a2af449.tar.xz
Merge branch 'magnumrocha-more-custom-configs'
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index 1c3c4348..cc568be7 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -53,6 +53,10 @@ public class MainActivity extends ActionBarActivity {
new IntentIntegrator(this).setCaptureActivity(ToolbarCaptureActivity.class).initiateScan();
}
+ public void scanCustomScanner(View view) {
+ new IntentIntegrator(this).setCaptureActivity(CustomScannerActivity.class).initiateScan();
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);