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

Commit d032b402 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 6063a9c9: Merge change 1491 into donut 

Merge commit '6063a9c9'

* commit '6063a9c9':
  Make pressing the search button within an app that does not support
parents dbcb3bab 6063a9c9

core/java/android/app/SearchDialog.java

+16 −4
Original line number Original line Diff line number Diff line
@@ -309,12 +309,24 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                    + appSearchData + ", " + globalSearch + ")");

                    + appSearchData + ", " + globalSearch + ")");

        }

        }

        

        

        // Try to get the searchable info for the provided component (or for global search,

        // if globalSearch == true).

        mSearchable = SearchManager.getSearchableInfo(componentName, globalSearch);

        mSearchable = SearchManager.getSearchableInfo(componentName, globalSearch);

        

        // If we got back nothing, and it wasn't a request for global search, then try again

        // for global search, as we'll try to launch that in lieu of any component-specific search.

        if (!globalSearch && mSearchable == null) {

            globalSearch = true;

            mSearchable = SearchManager.getSearchableInfo(componentName, globalSearch);

            

            // If we still get back null (i.e., there's not even a searchable info available

            // for global search), then really give up.

            if (mSearchable == null) {

            if (mSearchable == null) {

            // unfortunately, we can't log here.  it would be logspam every time the user

                // Unfortunately, we can't log here.  it would be logspam every time the user

            // clicks the "search" key on a non-search app

                // clicks the "search" key on a non-search app.

                return false;

                return false;

            }

            }

        }

        

        

        mLaunchComponent = componentName;

        mLaunchComponent = componentName;

        mAppSearchData = appSearchData;

        mAppSearchData = appSearchData;