diff options
Diffstat (limited to 'sample/src/main/java/example/zxing/ToolbarCaptureActivity.java')
| -rw-r--r-- | sample/src/main/java/example/zxing/ToolbarCaptureActivity.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java index eeea946b..da9819cc 100644 --- a/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java +++ b/sample/src/main/java/example/zxing/ToolbarCaptureActivity.java @@ -25,7 +25,6 @@ public class ToolbarCaptureActivity extends ActionBarActivity { setSupportActionBar(toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); - barcodeScannerView = (CompoundBarcodeView)findViewById(R.id.zxing_barcode_scanner); capture = new CaptureManager(this, barcodeScannerView); @@ -58,6 +57,12 @@ public class ToolbarCaptureActivity extends ActionBarActivity { } @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event); } |
