summaryrefslogtreecommitdiff
path: root/sample/src/main/java/example/zxing/MainActivity.java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@journeyapps.com>2015-12-29 16:57:08 +0300
committerRalf Kistner <ralf@journeyapps.com>2015-12-29 16:57:08 +0300
commitdbf0067cf63175e1fb9d21f6b9ad8e325ed1a2a5 (patch)
treefd40c5a72a8698af1097193c10453eb9454558aa /sample/src/main/java/example/zxing/MainActivity.java
parent77d0cdfe85cf76f3655a35e5edbd06d005192696 (diff)
parente25b6b5989e049501f9632dd83a1ef29e49ec824 (diff)
downloadzxing-android-embedded-dbf0067cf63175e1fb9d21f6b9ad8e325ed1a2a5.tar.xz
Merge branch 'surface-texture'
Diffstat (limited to 'sample/src/main/java/example/zxing/MainActivity.java')
-rw-r--r--sample/src/main/java/example/zxing/MainActivity.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java
index cc568be7..ba536a32 100644
--- a/sample/src/main/java/example/zxing/MainActivity.java
+++ b/sample/src/main/java/example/zxing/MainActivity.java
@@ -57,6 +57,13 @@ public class MainActivity extends ActionBarActivity {
new IntentIntegrator(this).setCaptureActivity(CustomScannerActivity.class).initiateScan();
}
+ public void scanMarginScanner(View view) {
+ IntentIntegrator integrator = new IntentIntegrator(this);
+ integrator.setOrientationLocked(false);
+ integrator.setCaptureActivity(SmallCaptureActivity.class);
+ integrator.initiateScan();
+ }
+
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data);