From 1bf164398757581a2c2893cb7d96c81672979eb7 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Wed, 12 May 2010 01:18:12 +0000
Subject: [PATCH] Move Account and Folder settings into a submenu. give access
 to global preferences from there, too. - many users never leave their inboxes
 making it hard to get up to Settigns

---
 res/menu/message_list_option.xml          | 14 +++++++++++++-
 src/com/fsck/k9/activity/MessageList.java | 11 +++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index 3f118587d..8ee5192b7 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -118,6 +118,12 @@
 		android:title="@string/mark_all_as_read_action"
 		android:icon="@drawable/ic_menu_inbox"
 	/>
+    <item
+        android:id="@+id/settings"
+        android:title="@string/preferences_action"
+        android:icon="@drawable/ic_menu_preferences">
+        <menu>
+
     <item
 		android:id="@+id/folder_settings"
 		android:title="@string/folder_settings_action"
@@ -127,7 +133,13 @@
 		android:id="@+id/account_settings"
 		android:title="@string/account_settings_action"
 		android:icon="@android:drawable/ic_menu_preferences"
-	/>	
+	/>
+    <item android:id="@+id/app_settings"
+        android:title="@string/preferences_action" 
+		android:icon="@android:drawable/ic_menu_preferences"
+	/>
+    </menu>
+    </item>
 	<item
         android:id="@+id/expunge"
         android:title="@string/expunge_action"
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 8e8476c11..238843fce 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -25,6 +25,7 @@ import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import com.fsck.k9.*;
 import com.fsck.k9.MessagingController.SORT_TYPE;
+import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
 import com.fsck.k9.mail.*;
@@ -786,6 +787,12 @@ public class MessageList
         }
     }
 
+    private void onEditPrefs()
+    {
+        Prefs.actionPrefs(this);
+    }
+
+
     private void onEditAccount()
     {
         AccountSettings.actionSettings(this, mAccount);
@@ -1219,6 +1226,10 @@ public class MessageList
 
                 return true;
 
+            case R.id.app_settings:
+                onEditPrefs();
+                return true;
+
             case R.id.batch_copy_op:
                 onCopyBatch();
                 return true;