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

Commit c42ac0a5 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Removing LauncherCallbacks control over app search 

Change-Id: Icb199607dea3f169055e44946272aa9f1e758d1d
parent 2953833b

src/com/android/launcher3/Launcher.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -2166,15 +2166,6 @@ public class Launcher extends Activity 
        }

        }

    }

    }





    public void startSearchFromAllApps(View v, Intent searchIntent, String searchQuery) {

        if (mLauncherCallbacks != null && mLauncherCallbacks.startSearchFromAllApps(searchQuery)) {

            return;

        }



        // If not handled, then just start the provided search intent

        startActivitySafely(v, searchIntent, null);

    }



    public boolean isOnCustomContent() {

    public boolean isOnCustomContent() {

        return mWorkspace.isOnOrMovingToCustomContent();

        return mWorkspace.isOnOrMovingToCustomContent();

    }

    }

src/com/android/launcher3/LauncherCallbacks.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -77,6 +77,7 @@ public interface LauncherCallbacks { 
    public boolean providesSearch();

    public boolean providesSearch();

    public boolean startSearch(String initialQuery, boolean selectInitialQuery,

    public boolean startSearch(String initialQuery, boolean selectInitialQuery,

            Bundle appSearchData, Rect sourceBounds);

            Bundle appSearchData, Rect sourceBounds);

    @Deprecated

    public boolean startSearchFromAllApps(String query);

    public boolean startSearchFromAllApps(String query);

    @Deprecated

    @Deprecated

    public void startVoice();

    public void startVoice();

src/com/android/launcher3/allapps/AllAppsGridAdapter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -499,7 +499,7 @@ public class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter. 
                searchMarketView.setOnClickListener(new View.OnClickListener() {

                searchMarketView.setOnClickListener(new View.OnClickListener() {

                    @Override

                    @Override

                    public void onClick(View v) {

                    public void onClick(View v) {

                        mLauncher.startSearchFromAllApps(v, mMarketSearchIntent, mLastSearchQuery);

                        mLauncher.startActivitySafely(v, mMarketSearchIntent, null);

                    }

                    }

                });

                });

                return new ViewHolder(searchMarketView);

                return new ViewHolder(searchMarketView);