Remove unneeded menu from the preview activity

diff --git a/QRScanner/mobile/src/main/java/cz/cvut/fel/dce/qrscanner/PreviewActivity.java b/QRScanner/mobile/src/main/java/cz/cvut/fel/dce/qrscanner/PreviewActivity.java
index 929b8f35c31bcfe666cbfe9a5c6d90d07eff8f52..9539e07610f9edc0ae8ba42cf35ace8a511fdc56 100644 (file)
--- a/QRScanner/mobile/src/main/java/cz/cvut/fel/dce/qrscanner/PreviewActivity.java
+++ b/QRScanner/mobile/src/main/java/cz/cvut/fel/dce/qrscanner/PreviewActivity.java
@@ -83,21 +83,6 @@ public class PreviewActivity extends ActionBarActivity implements ViewTreeObserv
                return true;
        }
 
-       @Override
-       public boolean onOptionsItemSelected(MenuItem item) {
-               // Handle action bar item clicks here. The action bar will
-               // automatically handle clicks on the Home/Up button, so long
-               // as you specify a parent activity in AndroidManifest.xml.
-               int id = item.getItemId();
-
-               //noinspection SimplifiableIfStatement
-               if (id == R.id.action_settings) {
-                       return true;
-               }
-
-               return super.onOptionsItemSelected(item);
-       }
-
        @Override
        public void onGlobalLayout() {
                try {

diff --git a/QRScanner/mobile/src/main/res/menu/menu_preview.xml b/QRScanner/mobile/src/main/res/menu/menu_preview.xml
index 5bf51818ab63cebea96dc87ac6adec3272cfe6b2..315a85ad97f452fa497e17b7f9adbdae0e95d537 100644 (file)
--- a/QRScanner/mobile/src/main/res/menu/menu_preview.xml
+++ b/QRScanner/mobile/src/main/res/menu/menu_preview.xml
@@ -2,8 +2,4 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
       tools:context="cz.cvut.fel.dce.qrscanner.PreviewActivity">
-    <item android:id="@+id/action_settings"
-          android:title="@string/action_settings"
-          android:orderInCategory="100"
-          app:showAsAction="never"/>
 </menu>