From 120a6f9ba44c12919ba49aa62ed6006a8bec4202 Mon Sep 17 00:00:00 2001
From: Bao-Long Nguyen-Trong <baolongnt@gmail.com>
Date: Sun, 7 Jun 2009 23:44:45 +0000
Subject: [PATCH] Reordered menu options to have most useful ones on the left
 (see design guidelines)

---
 res/menu/accounts_option.xml     | 28 ++++++++++++++--------------
 res/menu/folder_list_option.xml  | 14 +++++++-------
 res/menu/message_list_option.xml | 11 +++++------
 3 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/res/menu/accounts_option.xml b/res/menu/accounts_option.xml
index 2e4938ad2..902b7ca34 100644
--- a/res/menu/accounts_option.xml
+++ b/res/menu/accounts_option.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_menu_refresh"
+		android:id="@+id/compose"
+        android:alphabeticShortcut="c"
+        android:title="@string/compose_action"
+		android:icon="@drawable/ic_menu_compose"
 	/>
 	<item
 		android:id="@+id/add_new_account"
@@ -12,22 +12,22 @@
 		android:icon="@drawable/ic_menu_add"
 	/>
 	<item
-		android:id="@+id/compose"
-        android:alphabeticShortcut="c"
-        android:title="@string/compose_action"
-		android:icon="@drawable/ic_menu_compose"
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="@drawable/ic_menu_refresh"
 	/>
-	<item
-		android:id="@+id/about"
-        android:title="@string/about_action"
-		android:icon="@drawable/ic_menu_preferences"
-	/>
 	<!-- 
 		<item android:id="@+id/search"
 		android:title="@string/search_action" />
 	-->
         <item android:id="@+id/edit_prefs"
         android:title="@string/preferences_action" 
-		android:icon="@drawable/ic_menu_preferences"
+		android:icon="@drawable/ic_menu_preferences"
 />
+	<item
+		android:id="@+id/about"
+        android:title="@string/about_action"
+		android:icon="@drawable/ic_menu_preferences"
+	/>
 </menu>
diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 430501595..068f59585 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -6,12 +6,6 @@
 		android:title="@string/compose_action"
 		android:icon="@drawable/ic_menu_compose"
 	/>
-	<item
-		android:id="@+id/check_mail"
-        android:alphabeticShortcut="r"
-		android:title="@string/check_mail_action"
-		android:icon="@drawable/ic_menu_refresh"
-	/>
     <item
 		android:id="@+id/accounts"
 		android:title="@string/accounts_action"
@@ -22,7 +16,13 @@
 		android:title="@string/list_folders_action"
 		android:icon="@drawable/ic_menu_refresh"
 	/>
-		<item
+	<item
+		android:id="@+id/check_mail"
+        android:alphabeticShortcut="r"
+		android:title="@string/check_mail_action"
+		android:icon="@drawable/ic_menu_refresh"
+	/>
+    <item
 		android:id="@+id/empty_trash"
         android:alphabeticShortcut="e"
 		android:title="@string/empty_trash_action"
diff --git a/res/menu/message_list_option.xml b/res/menu/message_list_option.xml
index ea6c30424..a8c6d4f98 100644
--- a/res/menu/message_list_option.xml
+++ b/res/menu/message_list_option.xml
@@ -38,17 +38,16 @@
 			/>
 		</menu>
 	</item>
-		<item
-		android:id="@+id/reverse_sort"
-		android:title="@string/reverse_sort_action"
-		android:icon="@drawable/ic_menu_reverse_sort"
-	/>
 	<item
 		android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
 		android:title="@string/check_mail_action"
 		android:icon="@drawable/ic_menu_refresh"
 	/>
-
+    <item
+		android:id="@+id/reverse_sort"
+		android:title="@string/reverse_sort_action"
+		android:icon="@drawable/ic_menu_reverse_sort"
+	/>
 
 </menu>