Merge "Pressing back button clears search"

1 files changed, 10 insertions, 2 deletions

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 5cb3b0d5545f..9c0a04ca751c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -755,11 +755,19 @@ public abstract class BaseActivity extends Activity {
          *     search currently.
          */
         boolean cancelSearch() {
+            boolean collapsed = false;
+            boolean closed = false;
+
             if (mActionBar.hasExpandedActionView()) {
                 mActionBar.collapseActionView();
-                return true;
+                collapsed = true;
             }
-            return false;
+
+            if (isExpanded() || isSearching()) {
+                onClose();
+                closed = true;
+            }
+            return collapsed || closed;
         }
 
         boolean isSearching() {