From 7c21605ee068f6a23b7834d5901fac3cf6627893 Mon Sep 17 00:00:00 2001
From: Xavier <xavier.gibert@c-s.fr>
Date: Tue, 15 Jul 2014 17:08:24 +0200
Subject: [PATCH] BUGFIX:TEMPORAL Block menu functions that crash Android 4.4.4
---
res/menu/global.xml | 4 ++--
res/menu/main.xml | 4 ++--
src/cs/si/stavor/MainActivity.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/res/menu/global.xml b/res/menu/global.xml
index f8d01f65..85ba9bde 100644
--- a/res/menu/global.xml
+++ b/res/menu/global.xml
@@ -6,13 +6,13 @@
android:orderInCategory="100"
android:title="@string/action_about"
app:showAsAction="never"/>
- <item
+ <!-- <item
android:id="@+id/action_reset_conf"
android:title="@string/action_reset_conf"
app:showAsAction="never"/>
<item
android:id="@+id/action_reset_db"
android:title="@string/action_reset_db"
- app:showAsAction="never"/>
+ app:showAsAction="never"/> -->
</menu>
diff --git a/res/menu/main.xml b/res/menu/main.xml
index 6e2e018b..fac695a4 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -12,13 +12,13 @@
android:orderInCategory="100"
android:title="@string/action_about"
app:showAsAction="never"/>
- <item
+ <!-- <item
android:id="@+id/action_reset_conf"
android:title="@string/action_reset_conf"
app:showAsAction="never"/>
<item
android:id="@+id/action_reset_db"
android:title="@string/action_reset_db"
- app:showAsAction="never"/>
+ app:showAsAction="never"/> -->
</menu>
diff --git a/src/cs/si/stavor/MainActivity.java b/src/cs/si/stavor/MainActivity.java
index ee27336a..fad24cf5 100644
--- a/src/cs/si/stavor/MainActivity.java
+++ b/src/cs/si/stavor/MainActivity.java
@@ -470,14 +470,14 @@ public class MainActivity extends ActionBarActivity implements
showAbout();
return true;
}
- if (id == R.id.action_reset_conf) {
+ /*if (id == R.id.action_reset_conf) {
resetUserConfigShowDialog();
return true;
}
if (id == R.id.action_reset_db) {
resetMissionsDbShowDialog();
return true;
- }
+ }*/
return super.onOptionsItemSelected(item);
}
--
GitLab