summaryrefslogtreecommitdiff
path: root/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
diff options
context:
space:
mode:
authorRalf Kistner <ralf@journeyapps.com>2016-06-05 20:09:20 +0300
committerRalf Kistner <ralf@journeyapps.com>2016-06-05 20:09:20 +0300
commit7d47cd352a2e73f8f3d1ed691af972bf40586538 (patch)
tree97bf3af5a907aa243ab057eb5ab0e260fc4758c2 /sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
parent3e12faa37902aa207371cd16e5033d5cbfe359cc (diff)
parent842895f0c4bf0e2d60f1cb5731cb3ffe09ba8276 (diff)
downloadzxing-android-embedded-7d47cd352a2e73f8f3d1ed691af972bf40586538.tar.xz
Merge branch 'next-cleanup'
Diffstat (limited to 'sample/src/main/java/example/zxing/ToolbarCaptureActivity.java')
-rw-r--r--sample/src/main/java/example/zxing/ToolbarCaptureActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
index f497d117..d11fe530 100644
--- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
+++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java
@@ -6,14 +6,14 @@ import android.support.v7.widget.Toolbar;
import android.view.KeyEvent;
import com.journeyapps.barcodescanner.CaptureManager;
-import com.journeyapps.barcodescanner.CompoundBarcodeView;
+import com.journeyapps.barcodescanner.DecoratedBarcodeView;
/**
* Sample Activity extending from ActionBarActivity to display a Toolbar.
*/
public class ToolbarCaptureActivity extends ActionBarActivity {
private CaptureManager capture;
- private CompoundBarcodeView barcodeScannerView;
+ private DecoratedBarcodeView barcodeScannerView;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -25,7 +25,7 @@ public class ToolbarCaptureActivity extends ActionBarActivity {
setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner);
+ barcodeScannerView = (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner);
capture = new CaptureManager(this, barcodeScannerView);
capture.initializeFromIntent(getIntent(), savedInstanceState);