Pressing back button clears search

Bug:26143308 Change-Id: Iaa02d39a6ee1fd1a0c7d4d07453a481af97c7664
2015-12-21 11:43:40 -08:00
parent 3510bd9be5
commit 43f20493d0
1 changed files with 10 additions and 2 deletions
--- 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() {