diff options
| author | Ralf Kistner <ralf@journeyapps.com> | 2016-06-05 20:09:20 +0300 |
|---|---|---|
| committer | Ralf Kistner <ralf@journeyapps.com> | 2016-06-05 20:09:20 +0300 |
| commit | 7d47cd352a2e73f8f3d1ed691af972bf40586538 (patch) | |
| tree | 97bf3af5a907aa243ab057eb5ab0e260fc4758c2 /sample/src/main/java/example/zxing/SmallCaptureActivity.java | |
| parent | 3e12faa37902aa207371cd16e5033d5cbfe359cc (diff) | |
| parent | 842895f0c4bf0e2d60f1cb5731cb3ffe09ba8276 (diff) | |
| download | zxing-android-embedded-7d47cd352a2e73f8f3d1ed691af972bf40586538.tar.xz | |
Merge branch 'next-cleanup'
Diffstat (limited to 'sample/src/main/java/example/zxing/SmallCaptureActivity.java')
| -rw-r--r-- | sample/src/main/java/example/zxing/SmallCaptureActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sample/src/main/java/example/zxing/SmallCaptureActivity.java b/sample/src/main/java/example/zxing/SmallCaptureActivity.java index 87b6b0ce..c4baa8ed 100644 --- a/sample/src/main/java/example/zxing/SmallCaptureActivity.java +++ b/sample/src/main/java/example/zxing/SmallCaptureActivity.java @@ -1,15 +1,15 @@ package example.zxing; import com.journeyapps.barcodescanner.CaptureActivity; -import com.journeyapps.barcodescanner.CompoundBarcodeView; +import com.journeyapps.barcodescanner.DecoratedBarcodeView; /** * This activity has a margin. */ public class SmallCaptureActivity extends CaptureActivity { @Override - protected CompoundBarcodeView initializeContent() { + protected DecoratedBarcodeView initializeContent() { setContentView(R.layout.capture_small); - return (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); + return (DecoratedBarcodeView)findViewById(R.id.zxing_barcode_scanner); } } |
