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

Commit f63c46bf authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Revert "Temporarily disabling custom search controller"" into ub-launcher3-calgary

parents fc956e5a f51084c2

src/com/android/launcher3/Launcher.java

+5 −8
Original line number Diff line number Diff line
@@ -1378,14 +1378,11 @@ public class Launcher extends Activity 
        // Setup Apps and Widgets

        mAppsView = (AllAppsContainerView) findViewById(R.id.apps_view);

        mWidgetsView = (WidgetsContainerView) findViewById(R.id.widgets_view);

        if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {

            mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());

        } else {

            mAppsView.setSearchBarController(new DefaultAppSearchController());



        // TODO: Reenable this

//        if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {

//            mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());

//        } else {

//            mAppsView.setSearchBarController(new DefaultAppSearchController());

//        }

        }



        // Setup the drag controller (drop targets have to be added in reverse order in priority)

        dragController.setDragScoller(mWorkspace);