commit b17cbc038c5f4b8a43b96db042d958d1ac8c2ec5
author Vikram Aggarwal <viki@google.com> Fri Apr 06 15:41:46 2012 -0700
committer Vikram Aggarwal <viki@google.com> Fri Apr 06 15:41:46 2012 -0700
tree a59a42d8b9a8c2ff7fbef4980066511d479070b1
parent 62de1b104635b09e7f00b0941268ba1fa5460ddb

Collapse search action menu before starting a search

Change-Id: Ifa3f1c5cf18b4a9b47e1cf261c9c87a8e774ae06

src/com/android/mail/ui/AbstractActivityController.java

diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 740f948..70dc30d 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -708,6 +708,7 @@
         intent.putExtra(ConversationListContext.EXTRA_SEARCH_QUERY, query);
         intent.putExtra(Utils.EXTRA_ACCOUNT, mAccount);
         intent.setComponent(mActivity.getComponentName());
+        mActionBarView.collapseSearch();
         mActivity.startActivity(intent);
     }
 

src/com/android/mail/ui/ActionBarView.java

diff --git a/src/com/android/mail/ui/ActionBarView.java b/src/com/android/mail/ui/ActionBarView.java
index f00a99d..da55a07 100644
--- a/src/com/android/mail/ui/ActionBarView.java
+++ b/src/com/android/mail/ui/ActionBarView.java
@@ -106,6 +106,15 @@
         super(context, attrs, defStyle);
     }
 
+    /**
+     * Collapses the search action view.
+     */
+    public void collapseSearch() {
+        if (mSearch != null) {
+            mSearch.collapseActionView();
+        }
+    }
+
     public boolean onCreateOptionsMenu(Menu menu) {
         // If the mode is valid, then set the initial menu
         if (mMode == ViewMode.UNKNOWN) {