From 4b409dfd8145ce7ac3029cad44a2e8c2cb71091a Mon Sep 17 00:00:00 2001 From: Ralf Kistner Date: Sun, 3 May 2015 18:38:05 +0200 Subject: Improve handling of back button in toolbar sample. --- sample/src/main/java/example/zxing/ToolbarCaptureActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'sample/src/main/java') 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); @@ -57,6 +56,12 @@ public class ToolbarCaptureActivity extends ActionBarActivity { capture.onSaveInstanceState(outState); } + @Override + public boolean onSupportNavigateUp() { + onBackPressed(); + return true; + } + @Override public boolean onKeyDown(int keyCode, KeyEvent event) { return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event); -- cgit v1.2.3