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] 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