From 5cd044a6cce1a2d7c097c0409b26db198b280e4a Mon Sep 17 00:00:00 2001
From: Lilia Markham <lilia.markham@causes.com>
Date: Wed, 27 Mar 2013 19:10:15 -0700
Subject: [PATCH] Swap settings and clear passphrase menu options

Android design pattern best practice recommends placing the settings
menu item below all other items because it's not frequently needed.

In that spirit, I've also moved the clear passphrase option to be first
since it is likely to be used more often than database import/export.
---
 res/menu/text_secure_normal.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml
index 5ba90ddce8..a614df98a4 100644
--- a/res/menu/text_secure_normal.xml
+++ b/res/menu/text_secure_normal.xml
@@ -5,9 +5,9 @@
           android:icon="@drawable/ic_menu_msg_compose_holo_dark"
           android:showAsAction="ifRoom" />
 
-    <item android:title="@string/text_secure_normal__menu_settings"
-          android:id="@+id/menu_settings"
-          android:icon="@android:drawable/ic_menu_preferences" />
+    <item android:title="@string/text_secure_normal__menu_clear_passphrase"
+          android:id="@+id/menu_clear_passphrase"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel" />
 
     <item android:title="@string/text_secure_normal__menu_import_export"
           android:icon="@android:drawable/ic_menu_save">
@@ -22,8 +22,8 @@
         </menu>
     </item>
 
-    <item android:title="@string/text_secure_normal__menu_clear_passphrase"
-          android:id="@+id/menu_clear_passphrase"
-          android:icon="@android:drawable/ic_menu_close_clear_cancel" />
+    <item android:title="@string/text_secure_normal__menu_settings"
+          android:id="@+id/menu_settings"
+          android:icon="@android:drawable/ic_menu_preferences" />
 
 </menu>