Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cba92f2 authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

Merge "Pressing back button clears search"

parents ba01af67 713f6284

src/com/android/documentsui/BaseActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -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() {