PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sunny Goyal
2016-02-18 16:55:48 +00:00
committed by Android (Google) Code Review
parent fc956e5a2a f51084c296
commit f63c46bf5e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+5 -8
View File
@@ -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);
mAppsView.setSearchBarController(new DefaultAppSearchController());
// TODO: Reenable this
// if (mLauncherCallbacks != null && mLauncherCallbacks.getAllAppsSearchBarController() != null) {
// mAppsView.setSearchBarController(mLauncherCallbacks.getAllAppsSearchBarController());
// } else {
// mAppsView.setSearchBarController(new DefaultAppSearchController());
// }
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);