From 7459f1c6b504d936d41aa30bb25dc4ec585acd50 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 15 May 2012 11:26:28 -0400
Subject: [PATCH 01/12] Issue 1911:  Permit folder names to wrap on multiple
 lines in folder list view so users can see the entire name.

Reduce the default font size used in folder list view to a reasonable size so that long folder paths wrap to fewer lines.
---
 res/layout/folder_list_item.xml | 2 --
 src/com/fsck/k9/FontSizes.java  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 1050de2a9..8cd6d580d 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,8 +33,6 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/src/com/fsck/k9/FontSizes.java b/src/com/fsck/k9/FontSizes.java
index 5a1ae2a41..b48474d5c 100644
--- a/src/com/fsck/k9/FontSizes.java
+++ b/src/com/fsck/k9/FontSizes.java
@@ -136,7 +136,7 @@ public class FontSizes {
         accountName = MEDIUM;
         accountDescription = SMALL;
 
-        folderName = LARGE;
+        folderName = FONT_16SP;
         folderStatus = SMALL;
 
         messageListSubject = FONT_16SP;

From 26fe9b7757880e190fc0639f921abde4ccd0d984 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Mon, 26 Nov 2012 17:50:43 -0500
Subject: [PATCH 02/12] Create new preference option for wrapping folder names
 in folder list view.

Revert to using an ellipsized folder name as the default.
---
 res/layout/folder_list_item.xml                 |  2 ++
 res/values/strings.xml                          |  3 +++
 res/xml/global_preferences.xml                  | 12 ++++++++++++
 src/com/fsck/k9/K9.java                         | 10 ++++++++++
 src/com/fsck/k9/activity/FolderList.java        |  4 ++++
 src/com/fsck/k9/activity/setup/Prefs.java       |  6 ++++++
 src/com/fsck/k9/preferences/GlobalSettings.java |  3 +++
 7 files changed, 40 insertions(+)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 8cd6d580d..1050de2a9 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,6 +33,8 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 44e80e7ad..5339db35f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -322,6 +322,8 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="global_settings_registered_name_color_label">Colorize contacts</string>
     <string name="global_settings_registered_name_color_default">Don\'t colorize names in your contact list</string>
     <string name="global_settings_registered_name_color_changed">Colorize names in your contact list</string>
+    <string name="global_settings_folderlist_wrap_folder_names_label">Wrap folder names</string>
+    <string name="global_settings_folderlist_wrap_folder_names_summary">Show complete folder name wrapped on multiple lines rather than a partial name on a single line</string>
 
     <string name="global_settings_messageview_fixedwidth_label">Fixed-width fonts</string>
     <string name="global_settings_messageview_fixedwidth_summary">Use a fixed-width font when showing plain-text messages</string>
@@ -812,6 +814,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="accountlist_preferences">Account list</string>
     <string name="messagelist_preferences">Message lists</string>
     <string name="messageview_preferences">Messages</string>
+    <string name="folderlist_preferences">Folder lists</string>
     <string name="settings_theme_label">Theme</string>
     <string name="settings_language_label">Language</string>
 
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 75efa5598..cb90924ea 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -176,6 +176,18 @@
 
         </PreferenceCategory>
 
+        <PreferenceCategory
+            android:key="folderlist_preferences"
+            android:title="@string/folderlist_preferences">
+
+            <CheckBoxPreference
+                android:persistent="false"
+                android:key="folderlist_wrap_folder_name"
+                android:title="@string/global_settings_folderlist_wrap_folder_names_label"
+                android:summary="@string/global_settings_folderlist_wrap_folder_names_summary" />
+
+        </PreferenceCategory>
+
     </PreferenceScreen>
 
     <PreferenceScreen
diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java
index 7fa0885eb..b1ed09c4a 100644
--- a/src/com/fsck/k9/K9.java
+++ b/src/com/fsck/k9/K9.java
@@ -234,6 +234,7 @@ public class K9 extends Application {
     private static String mQuietTimeStarts = null;
     private static String mQuietTimeEnds = null;
     private static String mAttachmentDefaultPath = "";
+    private static boolean mWrapFolderNames = false;
 
     private static boolean mBatchButtonsMarkRead = true;
     private static boolean mBatchButtonsDelete = true;
@@ -499,6 +500,7 @@ public class K9 extends Application {
         editor.putBoolean("messageViewFixedWidthFont", mMessageViewFixedWidthFont);
         editor.putBoolean("messageViewReturnToList", mMessageViewReturnToList);
         editor.putBoolean("messageViewShowNext", mMessageViewShowNext);
+        editor.putBoolean("wrapFolderNames", mWrapFolderNames);
 
         editor.putBoolean("batchButtonsMarkRead", mBatchButtonsMarkRead);
         editor.putBoolean("batchButtonsDelete", mBatchButtonsDelete);
@@ -692,6 +694,7 @@ public class K9 extends Application {
         mMessageViewFixedWidthFont = sprefs.getBoolean("messageViewFixedWidthFont", false);
         mMessageViewReturnToList = sprefs.getBoolean("messageViewReturnToList", false);
         mMessageViewShowNext = sprefs.getBoolean("messageViewShowNext", false);
+        mWrapFolderNames = sprefs.getBoolean("wrapFolderNames", false);
 
         mBatchButtonsMarkRead = sprefs.getBoolean("batchButtonsMarkRead", true);
         mBatchButtonsDelete = sprefs.getBoolean("batchButtonsDelete", true);
@@ -1212,6 +1215,13 @@ public class K9 extends Application {
         }
     }
 
+    public static boolean wrapFolderNames() {
+    	return mWrapFolderNames;
+    }
+    public static void setWrapFolderNames(final boolean state) {
+    	mWrapFolderNames = state;
+    }
+
     public static String getAttachmentDefaultPath() {
         return mAttachmentDefaultPath;
     }
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index a17376281..7e11be28f 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -1160,6 +1160,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             holder.chip.setBackgroundDrawable(mAccount.generateColorChip((folder.unreadMessageCount == 0 ? true : false ), false, false, false,false).drawable());
 
             holder.folderName.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderName());
+            if (K9.wrapFolderNames()) {
+                holder.folderName.setEllipsize(null);
+                holder.folderName.setSingleLine(false);
+            }
             holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
 
 
diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java
index 8a760e3dc..f7200fba3 100644
--- a/src/com/fsck/k9/activity/setup/Prefs.java
+++ b/src/com/fsck/k9/activity/setup/Prefs.java
@@ -92,6 +92,7 @@ public class Prefs extends K9PreferenceActivity {
     private static final String PREFERENCE_ATTACHMENT_DEF_PATH = "attachment_default_path";
     private static final String PREFERENCE_BACKGROUND_AS_UNREAD_INDICATOR = "messagelist_background_as_unread_indicator";
     private static final String PREFERENCE_THREADED_VIEW = "threaded_view";
+    private static final String PREFERENCE_FOLDERLIST_WRAP_NAME = "folderlist_wrap_folder_name";
 
     private static final int ACTIVITY_CHOOSE_FOLDER = 1;
 
@@ -122,6 +123,7 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mUseGalleryBugWorkaround;
     private CheckBoxPreference mDebugLogging;
     private CheckBoxPreference mSensitiveLogging;
+    private CheckBoxPreference mWrapFolderNames;
 
     private CheckBoxPreference mQuietTimeEnabled;
     private com.fsck.k9.preferences.TimePickerPreference mQuietTimeStarts;
@@ -394,6 +396,9 @@ public class Prefs extends K9PreferenceActivity {
                 }
             };
         });
+        
+        mWrapFolderNames = (CheckBoxPreference)findPreference(PREFERENCE_FOLDERLIST_WRAP_NAME);
+        mWrapFolderNames.setChecked(K9.wrapFolderNames());
 
         mBatchButtonsMarkRead = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_MARK_READ);
         mBatchButtonsDelete = (CheckBoxPreference)findPreference(PREFERENCE_BATCH_BUTTONS_DELETE);
@@ -468,6 +473,7 @@ public class Prefs extends K9PreferenceActivity {
 
         K9.setQuietTimeStarts(mQuietTimeStarts.getTime());
         K9.setQuietTimeEnds(mQuietTimeEnds.getTime());
+        K9.setWrapFolderNames(mWrapFolderNames.isChecked());
 
         if (mNotificationQuickDelete != null) {
             K9.setNotificationQuickDeleteBehaviour(
diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index 190b46765..fd3b7f00b 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -197,6 +197,9 @@ public class GlobalSettings {
         s.put("useVolumeKeysForNavigation", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
+        s.put("wrapFolderNames", Settings.versions(
+                new V(21, new BooleanSetting(false))
+            ));
         s.put("batchButtonsMarkRead", Settings.versions(
                 new V(8, new BooleanSetting(true))
             ));

From 2c20413af6d5568499288e254959de27964b13e7 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sun, 30 Sep 2012 23:05:32 -0400
Subject: [PATCH 03/12] Permit the folder list item to expand vertically.

Prior to this, in cases where the folder name wraps to mulitiple lines,
it could overflow its box and the overflow was hidden.
---
 res/layout/folder_list_item.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 1050de2a9..89f7f769d 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -23,7 +23,7 @@
 
     <LinearLayout
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
         android:layout_weight="1"
         android:orientation="vertical"
         android:gravity="center_vertical"

From d5a2c6b5c73462b4ac3b145a5e3464f0ec12a251 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 2 Oct 2012 16:03:59 -0400
Subject: [PATCH 04/12] Control wrapping of folder names programmatically only

This removes the default settings (ellipsized, single line) from the layout
xml file and implements them programmatically.  This fixes the problem where:
You are viewing a folder list while wrapping is currently on, then you go into settings
and turn wrapping off, after which you are back at the folder list, but the
list is still wrapped.
---
 res/layout/folder_list_item.xml          | 2 --
 src/com/fsck/k9/activity/FolderList.java | 5 +++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 89f7f769d..bbc885428 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -33,8 +33,6 @@
             android:id="@+id/folder_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:ellipsize="start"
             android:textColor="?android:attr/textColorPrimary"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 7e11be28f..e0192c62a 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -16,6 +16,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
 import android.text.Editable;
+import android.text.TextUtils.TruncateAt;
 import android.text.TextWatcher;
 import android.util.Log;
 import android.util.TypedValue;
@@ -1164,6 +1165,10 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
                 holder.folderName.setEllipsize(null);
                 holder.folderName.setSingleLine(false);
             }
+            else {
+                holder.folderName.setEllipsize(TruncateAt.START);
+                holder.folderName.setSingleLine(true);
+            }
             holder.folderStatus.setTextSize(TypedValue.COMPLEX_UNIT_SP, mFontSizes.getFolderStatus());
 
 

From 9b851f20e3e93f557c60bf8d03399928ec60a8c3 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 22 Dec 2012 23:31:23 -0500
Subject: [PATCH 05/12] Readjust settings version number based on current
 master

---
 src/com/fsck/k9/preferences/GlobalSettings.java | 2 +-
 src/com/fsck/k9/preferences/Settings.java       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/src/com/fsck/k9/preferences/GlobalSettings.java
index fd3b7f00b..8fb83f3bf 100644
--- a/src/com/fsck/k9/preferences/GlobalSettings.java
+++ b/src/com/fsck/k9/preferences/GlobalSettings.java
@@ -198,7 +198,7 @@ public class GlobalSettings {
                 new V(1, new BooleanSetting(false))
             ));
         s.put("wrapFolderNames", Settings.versions(
-                new V(21, new BooleanSetting(false))
+                new V(22, new BooleanSetting(false))
             ));
         s.put("batchButtonsMarkRead", Settings.versions(
                 new V(8, new BooleanSetting(true))
diff --git a/src/com/fsck/k9/preferences/Settings.java b/src/com/fsck/k9/preferences/Settings.java
index d7f521d4b..39431cb28 100644
--- a/src/com/fsck/k9/preferences/Settings.java
+++ b/src/com/fsck/k9/preferences/Settings.java
@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 21;
+    public static final int VERSION = 22;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,

From 11ce4fc6eae832e40c1138320d8d8d743f35147e Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 23 Oct 2012 17:58:48 -0400
Subject: [PATCH 06/12] Create action buttons to search for folders.

---
 res/menu/folder_list_option.xml   | 11 ++++++-----
 res/menu/folder_select_option.xml | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 6926a93ec..f5d63b8d7 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
+    <item
+        android:id="@+id/filter_folders"
+        android:icon="?attr/iconActionSearch"
+        android:showAsAction="always"
+        android:title="@string/filter_folders_action"/>
     <item
         android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
@@ -29,9 +33,6 @@
             <item
                 android:id="@+id/display_not_second_class"
                 android:title="@string/folder_list_display_mode_not_second_class"/>
-            <item
-                android:id="@+id/filter_folders"
-                android:title="@string/filter_folders_action"/>
         </menu>
     </item>
     <item
@@ -66,4 +67,4 @@
         </menu>
     </item>
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index adfb7a913..0275629c5 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -6,6 +6,12 @@
         android:icon="@drawable/ic_show_folders"
     >
         <menu>-->
+           <item
+            android:id="@+id/filter_folders"
+            android:icon="?attr/iconActionSearch"
+            android:showAsAction="always"
+            android:title="@string/filter_folders_action"
+           />
             <item
             android:id="@+id/display_all"
             android:title="@string/folder_list_display_mode_all"
@@ -31,11 +37,6 @@
             android:title="@string/refresh_folders_action"
             android:icon="?attr/iconMenuRefresh"
          />
-           <item
-            android:id="@+id/filter_folders"
-            android:title="@string/filter_folders_action"
-            android:icon="?attr/iconMenuSearch"
-         />
         
     <!--     </menu>
     </item>-->

From 1ea95028443967799f973e3c1ec72a33cffee63a Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Mon, 26 Nov 2012 12:57:37 -0500
Subject: [PATCH 07/12] Provide new action bar "find folder" icons

---
 res/drawable-hdpi/action_search_folder_dark.png  | Bin 0 -> 1228 bytes
 res/drawable-hdpi/action_search_folder_light.png | Bin 0 -> 1749 bytes
 res/drawable-ldpi/action_search_folder_dark.png  | Bin 0 -> 626 bytes
 res/drawable-ldpi/action_search_folder_light.png | Bin 0 -> 829 bytes
 res/drawable-mdpi/action_search_folder_dark.png  | Bin 0 -> 823 bytes
 res/drawable-mdpi/action_search_folder_light.png | Bin 0 -> 1184 bytes
 res/drawable-xhdpi/action_search_folder_dark.png | Bin 0 -> 1673 bytes
 .../action_search_folder_light.png               | Bin 0 -> 2390 bytes
 res/menu/folder_list_option.xml                  |   2 +-
 res/menu/folder_select_option.xml                |   2 +-
 res/values/attrs.xml                             |   1 +
 res/values/themes.xml                            |   2 ++
 12 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 res/drawable-hdpi/action_search_folder_dark.png
 create mode 100644 res/drawable-hdpi/action_search_folder_light.png
 create mode 100644 res/drawable-ldpi/action_search_folder_dark.png
 create mode 100644 res/drawable-ldpi/action_search_folder_light.png
 create mode 100644 res/drawable-mdpi/action_search_folder_dark.png
 create mode 100644 res/drawable-mdpi/action_search_folder_light.png
 create mode 100644 res/drawable-xhdpi/action_search_folder_dark.png
 create mode 100644 res/drawable-xhdpi/action_search_folder_light.png

diff --git a/res/drawable-hdpi/action_search_folder_dark.png b/res/drawable-hdpi/action_search_folder_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..34d2d79123c34c313e5e49fa6e522041f7fb8a2e
GIT binary patch
literal 1228
zcmV;-1T*`IP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11W8FmK~!jg?b%(3RaF!R@ZZd+Xk~#>6j72{P9H{!JxEZ**as0&
z1U*CrWl$PD^iW1qA%@gTMxUS{Jrop45D|S)LzEOHl|D$$gk@rkN@W%~Oq0&^u+H_K
zx!!xux%Uj-3FZ%%v-jD1uf6{JthM&q`*w_tjrl*Lv)u}m#T0>dV~Rk#F|EYdx#&)Q
z3zFX<^kX1-?!bYPI%cAyg)q7VE3vRZ-%)&s^%!h+q9SO9z)bYw`Z{exV%1N=JapBx
z|BL6asWmklqbPyX69q0vz1xmAgsJR7MbHeKC%({f%t?)T2TzMHGa)EKU?w)IDnEh^
zc&&gUr(hMXNxgd>uQ#n}0~8_fl&ab6!lU@9$$5IPS}ev0?nq>nMqU_QqN@Ce)|7`n
zyp)t@V2yGS@F?;KtW1?RXifPF-on<T+>JX+$U2HF0&`VE<#u87WiTepaX6_jD=81z
z1iDk@H%(0B*n`bUc|K;B6_{m*X#zi_%J<@mg7Uu-n^+qCA}V#_GF3t?A&bC*<T;Gp
zsrP5$l7jLt#QS39E7*}LFIJL3mI+k|{HS&F=`ubL5Ic4SbCg6DfkVmj#FBIL;G$GL
zEpJ~**_kHPk27(O*noyJ`eva64`M}9Py5zh;mEhvjM<G(iwMsmFo3JYSDG(EX{%U*
zk8r>71okKO2Wt9%W&#NGr^**AM}TnTU8;M_7=Fe<+*H%|pQ1vu2<#Bf+lhNbUjJvE
zelOtb0(1Q?!tdoty-)bSMiJSv@Gf4i*N{cvfKd7d5iM5XF_GJ+@c~XXKI5##Ct_85
zllrJgO|DYxVDw$1hP;GoeWKX(<k^Q8llqOq1b)MPxVg^wVX<-pcpRrC?>`pi^h5#W
zhwyEq#=K;1P#k0`SS`ND8ayO6sZLy3XY4lIj`xJ}X*=H}&I<E#=7%puCR`UqPh`Eu
zukcopnC-y{xJ}scLDj?jps@K~)s?Scr`X`m#yVlHXJA&Hxt|nfT8coYSj`n8pC`;?
zb4uX>u}M{KDi*3bY&}#+{E^gW;BIjY?MU7o!L|6SEP)En73R~O*D-}rVe^~BfoOiJ
zZ6`j*B5c8{xCM_065pt9fOXNzwaPSc7+IDm)5wp;gwt;j4tui5jb5oCkw%{|xeAGO
zB9(85RtTgqTcpH`MX22;(u4gXLhZ#;v5%ZDQi@-iAn`>aW5Nkc$Fstjw~5?kH2KXE
z_J67HfwZDSA{;Llq#B_@;z*t%tsbm9#L6yha@?;XBreM7*ONSRNgVIX-8sS!wiM{w
zgSC#m<r|0NO<*?e649owK>u74t@=QR;>XHbjN*H-cxzS7B@1uknYxO!`A@zs#Yp@u
z&L+p8-G6W#5ssQ?P7Ti@?Iu7ziNj(;tBc7%fW{;ai*&r<MR2=)pcY+t7}p82StsWf
qd$JK|8k5C@TE-NCc4LY_yYU~UqYS5dEV7jV0000<MNUMnLSTYl{6fe8

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/action_search_folder_light.png b/res/drawable-hdpi/action_search_folder_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3b208ae9877e25db2fcebca3533ecc5a0161ed1
GIT binary patch
literal 1749
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

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/action_search_folder_dark.png b/res/drawable-ldpi/action_search_folder_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..82e060596177a91acb33ce8b5a587c7f55f21582
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000VM000VM0sPELB>(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10q;pfK~zYI)z!_5&QTNx@XzBd6oXPU3Q@C|CfQC|*gOktW|~5Y
z6fsG%uv7j63z|s^smaUAA3&**#bhIkLEf6?k(X@7s2O37#l2I{{5*coql|Lu^y}X9
zyXSk(`JQucB_hnHESOjC{{mo9iLDcT=s-KhFp446S_P;y;9xP1;{cxG5#C}Gy0IPu
zxYZIuL=^R8L_COy-iW9aYzrgeNJNZ8L{EdWzi4rzGav44a`03{3`azJGk_w=eYq@m
znk0S+Q>ZqpP?6*gJVam+TMG6G9K<x9U^}jr0TeT6mk5PbSX0o=*q7}!wEbxYV^X)2
z$ss(?U?20k8}D(h8Ng`%`C{GPJ$!Be)P?K#h7rtQKR)5^?*N9d8;9{28*me+vwbEz
zt>Qc0;C#Wyje3A02Q_Jkj^Zm$NW9G86|P_>_F!BZ%ISiS;rd0RNrs*r^_0{tHL2!Z
zIr4FA!+l)EYMhZsui{5D06Fri)QW8qq0jPn61#FXB#zGJ04}$Z0W6W~`A+JP<=BB`
zQdy2ke9X!O`thRPN!e`*8?zQ=DOTjjSLVGoX*m1wvXu-fSXTo6MY>rB%^kSc*gLx@
z%OIrkl*yzN@t`#M@L{f(7OvbDbZbQ1j))5pv9{h;R-(Tm|No=^6LIECm?w%7YybcN
M07*qoM6N<$f+02*>;M1&

literal 0
HcmV?d00001

diff --git a/res/drawable-ldpi/action_search_folder_light.png b/res/drawable-ldpi/action_search_folder_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbedbe1470cb364d49c30d48faaf4f6c45c3d40e
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm000VM000VM0sPELB>(^b8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10=h{=K~zYI)m2SPRZ$dO>)b3vZBR<QLg<4g*}(VieUDcZBq1V1
zgFu=!s97`V7c^;D|Dd2jlO|DQB-X$tLhs&3V9+3nOhkH=p_nB1?A7EdSL<o^1#LKk
zbM`rF?X~wgXHydXrn$e0{x1l&HFFe;#r@8?QzW|qbV-^8@J`Zbk|d3vCE)rR^!4>^
zo1dRQOR^upl%!WA8vqI<d(3RNq<cw{JozPpFbvND=#zA}Uavn>ZUaddhT$N9Gm`Ga
zar|sEf;BZL7K{5y_Di~(B+0neu}iXAt@e=Q7|Ee1iaNJM;G8=JV5(lPZy1@R`vAU@
zEN@1zrpP3_B~40Fxm+HWw0E6<acODk+T`Tqauh{xBpn9u=%*C`=*kKTN$n(e<_Ca6
zYisN2jI05mZA%Iy&5|r^bU@NTrBa!aQ~)p+hT#Coqmn+waeQkt1@B1qkX&6ivznQW
zuMA1gGX)1Fy_MtvymHRXmP)15rBW%{NWrL?Rl_hGB>7rW7s;mphB8p|-aj_82!NL~
z8wA1SmGeOmK++h1+7A^ZNz#yX55O4!%Rvy_0MJR&NX`HlanALUJWldM5CqQ5mh%`v
z5WL9Gzk6r^5QgDNl0yK#0(e8RA*qn1#gqI1;E<#`fDw{AC7mbPUaQrvNU{wH03eE@
zPLk#9Dz*Wb1Mr^YXOfF%RwY@?>a^&byJ=<z;y8Yg$7%YTc64-nmUIjNNlpVu0So}R
z;Jv?OW~=w#IoD=p7h76d>g#cu5-cn%kmMecM*y54Sthw71KbXv&CC|_Bx#xs_xASg
z%i}an5lL1mm0isO@ZK*u=XQJVhn;h)56;YH;yAv#GH==svXAa#Gk<1Zs@3ZCG);#|
zwr7FO<v09xN1K?Km`>C5x|z*Ldg;Bto%c6Q(Vw#azv+JiuqI~fgfJau00000NkvXX
Hu0mjfUNdpG

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/action_search_folder_dark.png b/res/drawable-mdpi/action_search_folder_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..b192e496c24bee262f4a064252c3dd80a1d14a53
GIT binary patch
literal 823
zcmV-71IYY|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10<=j)K~z|U?bl6+Rb?2!@!$Aaeu1G=ATpu|6NJ%7%Q7NJK|xGK
z-53-Rg}7)_5-GN5)uKR{XklSx?GjfyB8ZC$Q8yxffLYV@F(iUfIzm1zp7+w7>$&5(
zlQtV4cscjH@AIDL|2|*m+^&c)kuqsQt=|X0lo~pdu?ox3iyjQ&JkH`EZj2Y8>kdh{
z6z>$na0@@<VN5M^KjB@Ry4wKj@rLx$0QTboM#|h`tieWf;ZyACm>?pm#?pxRCL#tR
zVnrLB#&|p;4n)L>8oIZQs>#U_v9H4i_D00F5pgIY=5_*5RRybL%m;9+rX$Z`FCM~%
zP9jiM1<T5Hf4MHigKhTzfnS>RU&iwP3eYRF{X)5a8+~o|U&Go0a!r=!W0;1UbpWbD
z&?8H2q{jX^*xGdeeKGz(9pmi)hGd=BX;QEW^ULoAxGo#hGfkr{P!+&=*<=>i1elJm
zBy<mcLpL@zjhXE>SDo@KR?8;ye$)J4GSjQ%S3D&TbR3W3a?|=N<$9^WjtOuOTV#hj
zB16)LllTrVwdh~O8GK$Kzr;RSlC5%Er>p|FA$xm2cH>PMmJvLU6-DpwV(1Xw!wh^O
zPhVx6ioP<|yWn-aSPbozb-qaE#vpzyFx!f8xLWo-i$}`(?6Nk9b)5hx57^Okq9Ivo
z3uMAgl5YQ6cF?&6;zP`nA>4r{@fkko6hL|C2HD{nP3F4H_T$nsy)qH^6#a$_Vmsc#
z$2dJ609c7x_#Id91D4<kydcZ&lQO@vWp4vwNOss!Qn%SW=ilUOC-d-U#r#6)`d2aB
zx_CFg37^JcdEzRFe(9-EQa1$ijnU1TWLSo(zZh+m6L@Vr0G&#A8;HwVz8CJ*XZf&<
zd22X6YE`^f9%x86cF6?o$I<^A;Epok|BUVf`~yQ_W6Kz7vK#;a002ovPDHLkV1l~#
Bc3}Vj

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/action_search_folder_light.png b/res/drawable-mdpi/action_search_folder_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c1add08c269097ac6028b591c8cf4932f3c3a6b
GIT binary patch
literal 1184
zcmV;R1Yi4!P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11RY64K~z|U?U&DMR96(ozu)_Q#b_`IB59BmEfp8ZjAP!!X$eJb
z7cEjK6lT#Pii@tgC@w3~|G;)p3f;QuqJ<&_g=$j}gfQ2nhJhAKX*6JMViLuYao)_k
z-!3{sLuL{uYU{=W58l1^+<QLfo^#K;kCN~##XM8%&jA4Vk5V9M^7(urP18L9hDZ(o
zSO9Q~<jqQ@a<yD8CyxujjgqiXDC|np^f-Va0FdM)Et2db=>vdsZo&8cbCZ*kH=Zg$
zKA%4%sYudu&RNg%E<5MuthKdbvFOdt&JLz&`U-#}06_Ahwf5Vm0#GOvcGc_kj{#Ji
zbLXa}rmnBIKpe*}kvs`tN1CQzY^2*xT9S~YNz?Rr!}AS|1Aw*mH%VVga>kfr<KyE!
zPXv(9=L-OaoO8BQZ>+VqNM0b>Q>j!AZ3dv_6r^do#~1_8^DYBGHk;iUMN!mlGRc+6
z$;m|kkaUUUQIdO~2mruPBirWyAP9nElG-jRX(f*1)7IJ*Ywb!tpTA3T_u<2b{fUW*
zdM5zwa$rExqP4cx!TfGXZ?0<p0U%gfT57vv9RUDXAlX+e7QK!ZFy=@um+NgbcSx%C
z_xD%F#>VzHpW)%*a5Dh6Ncyw0vxA)g00?~F|73W0xZgQ90ATt4{ri2+x!0S|wr$(G
z)|=dt10-((c(qYv=9>MI9!k2<)(c~ny1TnaBoV+2fEOj*X^z)wwYNt{M?vzowRU1d
zfJ&uuHHxA)033<q_!@w_0QO3{A?ash%+b~QlIGGh{oNRI20%4Qk{`k_JWaA)J!q+v
zEg>kE%Zcy%=Nh|l(mD5|q_0R`H^z*S%#zFk7y)qG^SqMhc^{CB09^5Xe`p=!ko42q
zzIDF^aU8!x@-0b@<ONBW0K6b+(D(g6lO&lBf*|Xhd$(a6k{;A*wa<Lt&ynmWxgS7x
zV{G19d!}Om061{qK-L&@Y?ViM@y}7);hY;V#!ylfz!d-oN%ly3;GFx$^Ss_9Nv?%q
z_&$Jr0KPAkN?&gZ0073v$9pQ3${~__N$v&^G>k5joT=CAmyIz)^?H3N2!fARZ@;AZ
zYPI@#S6A12^?Log>FMcTHw^#)aU35cxy2Z>oTlktwOZ|tF=o*B{g)-ZMzYU2cTv(E
z&+|^Kp4)^dm&*&1+}gDtc_V7bD1fYU4kQtV|JD_f&DZUo=RIukklYzX(T5`=BWD3D
zuN{ACcS2)KR#HjQd^?CR3{Pb;nZA~>PC}5&<$8l4Sht!rW$V_h_ZAlyw}fGMisa5V
zD!-IUrB7FPbQFT=>FIl&=r!bFCX+ea4nk7zTIK)bT0S!~vz#Q!*|p)2bbhUFM<IAz
y$z(EpQ52m3uwBx5Ywgtk3ebr>^FO2K0Dl9;3jD|gLT4-h0000<MNUMnLSTaB2rL-@

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/action_search_folder_dark.png b/res/drawable-xhdpi/action_search_folder_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7cc38ed67a561ee5433a1ff36904d31210989b8
GIT binary patch
literal 1673
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
Tn}m2500000NkvXXu0mjfllVN}

literal 0
HcmV?d00001

diff --git a/res/drawable-xhdpi/action_search_folder_light.png b/res/drawable-xhdpi/action_search_folder_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..de254cc83c8cdb44b886499218b976a03a3d7ab7
GIT binary patch
literal 2390
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
IM6N<$g6`N>=l}o!

literal 0
HcmV?d00001

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index f5d63b8d7..f850a99c6 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
         android:id="@+id/filter_folders"
-        android:icon="?attr/iconActionSearch"
+        android:icon="?attr/iconActionSearchFolder"
         android:showAsAction="always"
         android:title="@string/filter_folders_action"/>
     <item
diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index 0275629c5..d3723fde3 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -8,7 +8,7 @@
         <menu>-->
            <item
             android:id="@+id/filter_folders"
-            android:icon="?attr/iconActionSearch"
+            android:icon="?attr/iconActionSearchFolder"
             android:showAsAction="always"
             android:title="@string/filter_folders_action"
            />
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 745643fdd..7fa1032e9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -16,6 +16,7 @@
         <attr name="iconActionPreviousMessage" format="reference" />
         <attr name="iconActionRefresh" format="reference" />
         <attr name="iconActionSearch" format="reference" />
+        <attr name="iconActionSearchFolder" format="reference" />
         <attr name="iconActionSend" format="reference" />
         <attr name="iconActionSettings" format="reference" />
         <attr name="iconActionSingleMessageOptions" format="reference" />
diff --git a/res/values/themes.xml b/res/values/themes.xml
index f92c80518..7e10e1f56 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,6 +16,7 @@
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_light</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_light</item>
         <item name="iconActionSearch">@drawable/ic_action_search_light</item>
+        <item name="iconActionSearchFolder">@drawable/action_search_folder_light</item>
         <item name="iconActionSend">@drawable/ic_action_send_light</item>
         <item name="iconActionSettings">@drawable/ic_action_settings_light</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_light</item>
@@ -64,6 +65,7 @@
         <item name="iconActionPreviousMessage">@drawable/ic_action_previous_message_dark</item>
         <item name="iconActionRefresh">@drawable/ic_action_refresh_dark</item>
         <item name="iconActionSearch">@drawable/ic_action_search_dark</item>
+        <item name="iconActionSearchFolder">@drawable/action_search_folder_dark</item>
         <item name="iconActionSend">@drawable/ic_action_send_dark</item>
         <item name="iconActionSettings">@drawable/ic_action_settings_dark</item>
         <item name="iconActionSingleMessageOptions">@drawable/ic_action_single_message_options_dark</item>

From d7cb89880af9c61d4e757410d89713349a72af5a Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 27 Nov 2012 22:43:14 -0500
Subject: [PATCH 08/12] Switch to using the action bar for folder searches.

Eliminate the old-style search dialog box.
---
 res/menu/folder_list_option.xml          |   5 +-
 src/com/fsck/k9/activity/FolderList.java | 122 ++++-------------------
 2 files changed, 25 insertions(+), 102 deletions(-)

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index f850a99c6..65dd07c4f 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -3,8 +3,9 @@
     <item
         android:id="@+id/filter_folders"
         android:icon="?attr/iconActionSearchFolder"
-        android:showAsAction="always"
-        android:title="@string/filter_folders_action"/>
+        android:showAsAction="always|collapseActionView"
+        android:title="@string/filter_folders_action"
+        android:actionViewClass="com.actionbarsherlock.widget.SearchView"/>
     <item
         android:id="@+id/check_mail"
         android:alphabeticShortcut="r"
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index a17376281..3184be593 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -6,17 +6,12 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.PowerManager;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -30,7 +25,6 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.BaseAdapter;
-import android.widget.EditText;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.LinearLayout;
@@ -44,6 +38,7 @@ import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.actionbarsherlock.widget.SearchView;
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.FolderMode;
 import com.fsck.k9.AccountStats;
@@ -52,7 +47,6 @@ import com.fsck.k9.FontSizes;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.R;
-import com.fsck.k9.activity.FolderList.FolderListAdapter.FolderListFilter;
 import com.fsck.k9.activity.misc.ActionBarNavigationSpinner;
 import com.fsck.k9.activity.setup.AccountSettings;
 import com.fsck.k9.activity.setup.FolderSettings;
@@ -79,11 +73,6 @@ import de.cketti.library.changelog.ChangeLog;
  */
 
 public class FolderList extends K9ListActivity implements OnNavigationListener {
-    /*
-     * Constants for showDialog() etc.
-     */
-    private static final int DIALOG_FIND_FOLDER = 2;
-
     private static final String EXTRA_ACCOUNT = "account";
 
     private static final String EXTRA_INITIAL_FOLDER = "initialFolder";
@@ -493,14 +482,6 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
     }
 
-    /**
-     * Show an alert with an input-field for a filter-expression.
-     * Filter {@link #mAdapter} with the user-input.
-     */
-    private void onEnterFilter() {
-        showDialog(DIALOG_FIND_FOLDER);
-    }
-
     private void onEditPrefs() {
         Prefs.actionPrefs(this);
     }
@@ -581,11 +562,6 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
             return true;
 
-        case R.id.filter_folders:
-            onEnterFilter();
-
-            return true;
-
         case R.id.account_settings:
             onEditAccount();
 
@@ -643,9 +619,30 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         super.onCreateOptionsMenu(menu);
         getSupportMenuInflater().inflate(R.menu.folder_list_option, menu);
         mRefreshMenuItem = menu.findItem(R.id.check_mail);
+        configureFolderSearchView(menu);
         return true;
     }
 
+    private void configureFolderSearchView(Menu menu) {
+        final MenuItem folderMenuItem = menu.findItem(R.id.filter_folders);
+        final SearchView folderSearchView = (SearchView) folderMenuItem.getActionView();
+        folderSearchView.setQueryHint(getString(R.string.folder_list_filter_hint));
+        folderSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                folderMenuItem.collapseActionView();
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                mAdapter.getFilter().filter(newText);
+                return true;
+            }
+        });
+    }
+
     @Override public boolean onContextItemSelected(android.view.MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo();
         FolderInfoHolder folder = (FolderInfoHolder) mAdapter.getItem(info.position);
@@ -667,81 +664,6 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
     private FolderInfoHolder mSelectedContextFolder = null;
 
-    @Override
-    public Dialog onCreateDialog(int id) {
-        switch (id) {
-        case DIALOG_FIND_FOLDER: {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.filter_folders_action);
-
-            final EditText input = new EditText(this);
-            input.setId(R.id.filter_folders);
-            input.setHint(R.string.folder_list_filter_hint);
-            input.addTextChangedListener(new TextWatcher() {
-                @Override
-                public void onTextChanged(CharSequence s, int start, int before, int count) {
-                    mAdapter.getFilter().filter(input.getText());
-                }
-
-                @Override
-                public void beforeTextChanged(CharSequence s, int start, int count,
-                int after) {
-                    /* not used */
-                }
-
-                @Override
-                public void afterTextChanged(Editable s) {
-                    /* not used */
-                }
-            });
-
-            builder.setView(input);
-
-            builder.setPositiveButton(getString(R.string.okay_action),
-            new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int whichButton) {
-                    String value = input.getText().toString();
-                    mAdapter.getFilter().filter(value);
-                }
-            });
-
-            builder.setNegativeButton(getString(R.string.cancel_action),
-            new DialogInterface.OnClickListener() {
-                @Override
-                public void onClick(DialogInterface dialog, int whichButton) {
-                    mAdapter.getFilter().filter(null);
-                }
-            });
-
-            return builder.create();
-        }
-        }
-
-        return super.onCreateDialog(id);
-    }
-
-    @Override
-    public void onPrepareDialog(int id, Dialog dialog) {
-        switch (id) {
-        case DIALOG_FIND_FOLDER: {
-            AlertDialog alertDialog = (AlertDialog) dialog;
-            EditText input = (EditText) alertDialog.findViewById(R.id.filter_folders);
-
-            // Populate the EditText with the current search term
-            FolderListFilter filter = (FolderListFilter) mAdapter.getFilter();
-            input.setText(filter.getSearchTerm());
-
-            // Place the cursor at the end of the text
-            input.setSelection(input.getText().length());
-            break;
-        }
-        default: {
-            super.onPrepareDialog(id, dialog);
-        }
-        }
-    }
-
     @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;

From 993b0259067b5015ee000232c22948d1583bf9bd Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sat, 22 Dec 2012 19:05:29 -0500
Subject: [PATCH 09/12] Use a more appropriate title when diplaying folder
 search results.

---
 src/com/fsck/k9/activity/FolderList.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 3184be593..5c170ef45 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -632,6 +632,7 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
             @Override
             public boolean onQueryTextSubmit(String query) {
                 folderMenuItem.collapseActionView();
+                mActionBarTitle.setText(getString(R.string.filter_folders_action));
                 return true;
             }
 
@@ -641,6 +642,15 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
                 return true;
             }
         });
+
+        folderSearchView.setOnCloseListener(new SearchView.OnCloseListener() {
+            
+            @Override
+            public boolean onClose() {
+                mActionBarTitle.setText(getString(R.string.folders_title));
+                return false;
+            }
+        });
     }
 
     @Override public boolean onContextItemSelected(android.view.MenuItem item) {

From fa857f7d09671d79efa683696d1e6e3373b17ece Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Tue, 25 Dec 2012 22:39:18 -0500
Subject: [PATCH 10/12] Switch to using the action bar for folder searches.

Eliminate the old-style search dialog box.  A similar change
was previously made when searching from the folder list.  This
change is applicable when searching while choosing a
folder (e.g. a destination folder for a copy operation).
---
 res/menu/folder_select_option.xml          |  3 +-
 src/com/fsck/k9/activity/ChooseFolder.java | 75 +++++++---------------
 2 files changed, 24 insertions(+), 54 deletions(-)

diff --git a/res/menu/folder_select_option.xml b/res/menu/folder_select_option.xml
index d3723fde3..15ff36535 100644
--- a/res/menu/folder_select_option.xml
+++ b/res/menu/folder_select_option.xml
@@ -9,8 +9,9 @@
            <item
             android:id="@+id/filter_folders"
             android:icon="?attr/iconActionSearchFolder"
-            android:showAsAction="always"
+            android:showAsAction="always|collapseActionView"
             android:title="@string/filter_folders_action"
+            android:actionViewClass="com.actionbarsherlock.widget.SearchView"
            />
             <item
             android:id="@+id/display_all"
diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/src/com/fsck/k9/activity/ChooseFolder.java
index 1ac7ca9ae..faa907160 100644
--- a/src/com/fsck/k9/activity/ChooseFolder.java
+++ b/src/com/fsck/k9/activity/ChooseFolder.java
@@ -6,22 +6,18 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.text.Editable;
-import android.text.TextWatcher;
 import android.util.Log;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
+import com.actionbarsherlock.widget.SearchView;
 
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.EditText;
 import android.widget.Filter;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -172,9 +168,30 @@ public class ChooseFolder extends K9ListActivity {
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         getSupportMenuInflater().inflate(R.menu.folder_select_option, menu);
+        configureFolderSearchView(menu);
         return true;
     }
 
+    private void configureFolderSearchView(Menu menu) {
+        final MenuItem folderMenuItem = menu.findItem(R.id.filter_folders);
+        final SearchView folderSearchView = (SearchView) folderMenuItem.getActionView();
+        folderSearchView.setQueryHint(getString(R.string.folder_list_filter_hint));
+        folderSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                folderMenuItem.collapseActionView();
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                mAdapter.getFilter().filter(newText);
+                return true;
+            }
+        });
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
@@ -198,10 +215,6 @@ public class ChooseFolder extends K9ListActivity {
                 onRefresh();
                 return true;
             }
-            case R.id.filter_folders: {
-                onEnterFilter();
-                return true;
-            }
             default: {
                 return super.onOptionsItemSelected(item);
             }
@@ -212,50 +225,6 @@ public class ChooseFolder extends K9ListActivity {
         MessagingController.getInstance(getApplication()).listFolders(mAccount, true, mListener);
     }
 
-    /**
-     * Show an alert with an input-field for a filter-expression.
-     * Filter {@link #mAdapter} with the user-input.
-     */
-    private void onEnterFilter() {
-        final AlertDialog.Builder filterAlert = new AlertDialog.Builder(this);
-
-        final EditText input = new EditText(this);
-        input.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                mAdapter.getFilter().filter(input.getText().toString());
-            }
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
-                /* not used */ }
-
-            @Override
-            public void afterTextChanged(Editable s) { /* not used */ }
-        });
-        input.setHint(R.string.folder_list_filter_hint);
-        filterAlert.setView(input);
-
-        String okay = getString(R.string.okay_action);
-        filterAlert.setPositiveButton(okay, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int whichButton) {
-                String value = input.getText().toString().trim();
-                mAdapter.getFilter().filter(value);
-            }
-        });
-
-        String cancel = getString(R.string.cancel_action);
-        filterAlert.setNegativeButton(cancel, new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int whichButton) {
-                mAdapter.getFilter().filter("");
-            }
-        });
-
-        filterAlert.show();
-    }
-
     private void setDisplayMode(FolderMode aMode) {
         mMode = aMode;
         // invalidate the current filter as it is working on an inval

From d01ef4f9cb480170cde7d3b5412d8d3cea0933d4 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Fri, 11 Jan 2013 17:42:38 -0500
Subject: [PATCH 11/12] Eliminate unused code.

---
 src/com/fsck/k9/activity/FolderList.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index 5c170ef45..76ae65c8a 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -35,7 +35,6 @@ import android.widget.Toast;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
-import com.actionbarsherlock.view.ActionMode;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.widget.SearchView;
@@ -500,11 +499,6 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         MessagingController.getInstance(getApplication()).emptyTrash(account, null);
     }
 
-    private void onExpunge(final Account account, String folderName) {
-        MessagingController.getInstance(getApplication()).expunge(account, folderName, null);
-    }
-
-
     private void onClearFolder(Account account, String folderName) {
         // There has to be a cheaper way to get at the localFolder object than this
         LocalFolder localFolder = null;
@@ -672,8 +666,6 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         return super.onContextItemSelected(item);
     }
 
-    private FolderInfoHolder mSelectedContextFolder = null;
-
     @Override public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
         super.onCreateContextMenu(menu, v, menuInfo);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;

From ad16bf94cdb751788845ecd5529395796d52fcd2 Mon Sep 17 00:00:00 2001
From: Joe Steele <joe@madewell.net>
Date: Sun, 13 Jan 2013 22:35:59 -0500
Subject: [PATCH 12/12] Provide message search capability from the folder list.

The search is performed in all folders for the account
to which the folders belong.
---
 res/menu/folder_list_option.xml           |  5 +++++
 src/com/fsck/k9/activity/FolderList.java  | 13 +++++++++++++
 src/com/fsck/k9/activity/MessageList.java |  7 +++++--
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/res/menu/folder_list_option.xml b/res/menu/folder_list_option.xml
index 65dd07c4f..3f700bcf5 100644
--- a/res/menu/folder_list_option.xml
+++ b/res/menu/folder_list_option.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:id="@+id/search"
+        android:icon="?attr/iconActionSearch"
+        android:showAsAction="always"
+        android:title="@string/search_action"/>
     <item
         android:id="@+id/filter_folders"
         android:icon="?attr/iconActionSearchFolder"
diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index c123ba12d..1ece40d3b 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -537,6 +537,11 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
 
             return true;
 
+        case R.id.search:
+            onSearchRequested();
+
+            return true;
+
         case R.id.compose:
             MessageCompose.actionCompose(this, mAccount);
 
@@ -598,6 +603,14 @@ public class FolderList extends K9ListActivity implements OnNavigationListener {
         }
     }
 
+    @Override
+    public boolean onSearchRequested() {
+         Bundle appData = new Bundle();
+         appData.putString(MessageList.EXTRA_SEARCH_ACCOUNT, mAccount.getUuid());
+         startSearch(null, false, appData, false);
+         return true;
+     }
+
     private void onOpenFolder(String folder) {
         LocalSearch search = new LocalSearch(folder);
         search.addAccountUuid(mAccount.getUuid());
diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 31eda7daf..92f5e4839 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -58,7 +58,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
     private static final String EXTRA_SPECIAL_FOLDER = "special_folder";
 
     // used for remote search
-    private static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
+    public static final String EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account";
     private static final String EXTRA_SEARCH_FOLDER = "com.fsck.k9.search_folder";
 
     public static void actionDisplaySearch(Context context, SearchSpecification search,
@@ -180,7 +180,10 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
                 Bundle appData = getIntent().getBundleExtra(SearchManager.APP_DATA);
                 if (appData != null) {
                     mSearch.addAccountUuid(appData.getString(EXTRA_SEARCH_ACCOUNT));
-                    mSearch.addAllowedFolder(appData.getString(EXTRA_SEARCH_FOLDER));
+                    // searches started from a folder list activity will provide an account, but no folder
+                    if (appData.getString(EXTRA_SEARCH_FOLDER) != null) {
+                        mSearch.addAllowedFolder(appData.getString(EXTRA_SEARCH_FOLDER));
+                    }
                 } else {
                     mSearch.addAccountUuid(LocalSearch.ALL_ACCOUNTS);
                 }