From 08e249a2e984e2bdd43430ff1db75f94e7eb56d2 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Thu, 13 Jun 2013 02:48:01 +0200
Subject: [PATCH] Remove submenu from the account context menu

There seems to be a bug in Android that makes submenus inaccessible on
some devices, e.g. the Samsung Galaxy S2.
https://code.google.com/p/android/issues/detail?id=53239
---
 res/menu/accounts_context.xml          |  9 ++-------
 res/menu/disabled_accounts_context.xml | 21 ++++++++-------------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/res/menu/accounts_context.xml b/res/menu/accounts_context.xml
index 7c62fd1d8..f2c4f6c95 100644
--- a/res/menu/accounts_context.xml
+++ b/res/menu/accounts_context.xml
@@ -6,19 +6,14 @@
         android:title="@string/manage_accounts_move_down_action" />
     <item android:id="@+id/account_settings"
         android:title="@string/account_settings_action" />
-    <item android:id="@+id/advanced"
-        android:title="@string/advanced">
-        <menu>
+    <item android:id="@+id/delete_account"
+        android:title="@string/remove_account_action" />
     <item android:id="@+id/clear"
         android:title="@string/clear_action" />
     <item android:id="@+id/recreate"
         android:title="@string/recreate_action" />
-    <item android:id="@+id/delete_account"
-        android:title="@string/remove_account_action" />
     <item android:id="@+id/clear_pending"
         android:title="@string/clear_pending_action" />
     <item android:id="@+id/export"
         android:title="@string/settings_export_account" />
-    </menu>
-    </item>
 </menu>
diff --git a/res/menu/disabled_accounts_context.xml b/res/menu/disabled_accounts_context.xml
index 54d6c2afc..4a2c97b06 100644
--- a/res/menu/disabled_accounts_context.xml
+++ b/res/menu/disabled_accounts_context.xml
@@ -3,17 +3,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/activate"
         android:title="@string/activate_account_action" />
-    <item android:id="@+id/advanced"
-        android:title="@string/advanced">
-        <menu>
-            <item android:id="@+id/delete_account"
-                android:title="@string/remove_account_action" />
-            <item android:id="@+id/export"
-                android:title="@string/settings_export_account" />
-            <item android:id="@+id/move_up"
-                android:title="@string/manage_accounts_move_up_action" />
-            <item android:id="@+id/move_down"
-                android:title="@string/manage_accounts_move_down_action" />
-        </menu>
-    </item>
+    <item android:id="@+id/move_up"
+        android:title="@string/manage_accounts_move_up_action" />
+    <item android:id="@+id/move_down"
+        android:title="@string/manage_accounts_move_down_action" />
+    <item android:id="@+id/delete_account"
+        android:title="@string/remove_account_action" />
+    <item android:id="@+id/export"
+        android:title="@string/settings_export_account" />
 </menu>