diff options
| author | Ralf Kistner <ralf@journeyapps.com> | 2016-02-06 17:03:47 +0300 |
|---|---|---|
| committer | Ralf Kistner <ralf@journeyapps.com> | 2016-02-06 17:03:47 +0300 |
| commit | db3962cd3c2ae73e94da9c2e3092597d4ff4e1d5 (patch) | |
| tree | f7c2fe9333387703a163ac9825afbb01363ea95e /sample/src/main/java/example/zxing | |
| parent | 3bb383147dda601a7bcc6b0bc7a01fa5457204c4 (diff) | |
| parent | 062feb8453426f1585c11fbeaa94a8f35b416e35 (diff) | |
| download | zxing-android-embedded-db3962cd3c2ae73e94da9c2e3092597d4ff4e1d5.tar.xz | |
Merge branch 'master' into refactor-preview-scaling
Diffstat (limited to 'sample/src/main/java/example/zxing')
| -rw-r--r-- | sample/src/main/java/example/zxing/MainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sample/src/main/java/example/zxing/MainActivity.java b/sample/src/main/java/example/zxing/MainActivity.java index 399e4b52..6f8f964c 100644 --- a/sample/src/main/java/example/zxing/MainActivity.java +++ b/sample/src/main/java/example/zxing/MainActivity.java @@ -54,7 +54,7 @@ public class MainActivity extends ActionBarActivity { } public void scanCustomScanner(View view) { - new IntentIntegrator(this).setCaptureActivity(CustomScannerActivity.class).initiateScan(); + new IntentIntegrator(this).setOrientationLocked(false).setCaptureActivity(CustomScannerActivity.class).initiateScan(); } public void scanMarginScanner(View view) { |