Merge branch 'surface-texture'

2 files changed, 22 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);
diff --git a/sample/src/main/java/example/zxing/SmallCaptureActivity.java b/sample/src/main/java/example/zxing/SmallCaptureActivity.java
new file mode 100644
index 00000000..87b6b0ce
--- /dev/null
+++ b/sample/src/main/java/example/zxing/SmallCaptureActivity.java
@@ -0,0 +1,15 @@
+package example.zxing;
+
+import com.journeyapps.barcodescanner.CaptureActivity;
+import com.journeyapps.barcodescanner.CompoundBarcodeView;
+
+/**
+ * This activity has a margin.
+ */
+public class SmallCaptureActivity extends CaptureActivity {
+    @Override
+    protected CompoundBarcodeView initializeContent() {
+        setContentView(R.layout.capture_small);
+        return (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+    }
+}