commit 43551a2a2f5ed3899b068e5fc9464ba577815e35
author Aga Wronska <agawronska@google.com> Tue Dec 22 22:08:08 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 22 22:08:08 2015 +0000
tree 0019b33d7926f0939e95d633bd3663d474b48c40
parent 6ea25250a8ec014e5fbd3ce442c0669a85f631a5
parent 43f20493d0353a1db78becd2c59025eb7abb0a06

Merge "Pressing back button clears search"

packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 5cb3b0d..9c0a04c 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -755,11 +755,19 @@
          *     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() {