@sapui5/sap.ushell 1.115.0 → 1.116.0

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchCEP.controller.js

@@ -4,10 +4,9 @@ sap.ui.define([
     "sap/ui/core/mvc/Controller",
     "sap/ui/model/json/JSONModel",
     "sap/ui/core/Fragment",
+    "sap/m/List",
+    "sap/m/StandardListItem",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",
-    "sap/ushell/components/shell/SearchCEP/SearchProviders/NavigationSvcSearchProvider",
-    "sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider",
-    "sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider",
     "sap/base/Log",
     "sap/ushell/utils/WindowUtils",
     "sap/ui/thirdparty/jquery",
@@ -16,15 +15,15 @@ sap.ui.define([
     "sap/ui/Device",
     "sap/ui/core/Configuration",
     "sap/base/util/UriParameters",
-    "sap/ui/core/Core"
+    "sap/ui/core/Core",
+    "sap/ushell/EventHub"
 ], function (
     Controller,
     JSONModel,
     Fragment,
+    List,
+    StandardListItem,
     SearchProvider,
-    NavigationSvcSearchProvider,
-    FrequentActivityProvider,
-    RecentSearchProvider,
     Log,
     WindowUtils,
     jQuery,
@@ -33,56 +32,69 @@ sap.ui.define([
     Device,
     Configuration,
     UriParameters,
-    Core
+    Core,
+    EventHub
 ) {
     "use strict";
+
     return Controller.extend("sap.ushell.components.shell.SearchCEP.SearchCEP", {
 
         onInit: function () {
+
+            this._bIsMyHome = false;
             this._bEscPressed = false;
+            this.bGrowingReset = false;
+            this._SearchCEPService = sap.ushell.Container.getServiceAsync("SearchCEP");
+
+            this._SearchCEPService.then(function (oSearchCEPService) {
+                this._registerDefaultProviders(oSearchCEPService);
+                this._listenToServiceEvents(oSearchCEPService);
+            }.bind(this));
+
             this._toggleSearchPopover(false);
+
             this._oPlaceHolderSF = Core.byId("PlaceHolderSearchField");
-            this._oPlaceHolderSF.oParent.getDomRef().firstChild.lastChild.setAttribute("tabindex", "0");
-            this._bIsMyHome = false;
-            var sPlatform = sap.ushell.Container.getFLPPlatform(true),
-                urlParams = UriParameters.fromURL(document.URL);
-            this._bOnInit = true;
-            this.bNavigateToNewResultPage = urlParams.get("cep-search-result-app") === "true";
+
+            var sPlatform = sap.ushell.Container.getFLPPlatform(true);
+
             if (sPlatform === "MYHOME") {
                 this._bIsMyHome = true;
             }
         },
 
-        onSuggest: function (event) {
+        onSuggest: function (oEvent) {
+
             if (this._bEscPressed) {
                 return;
             }
-            var sUrl = sap.ushell.Container.getFLPUrl(true);
-            var sHash = UrlParsing.getHash(sUrl),
+
+            var sUrl = sap.ushell.Container.getFLPUrl(true),
+                sHash = UrlParsing.getHash(sUrl),
                 sIntent = sHash.split("&/")[0];
 
-            if (this.bOnNavigationToResultPage === true && (sIntent === "Action-search" || sIntent === "WorkZoneSearchResult-display")) {
+            if (this.bOnNavigationToResultPage === true &&
+                (sIntent === "Action-search" || sIntent === "WorkZoneSearchResult-display")
+            ) {
                 if (this._oPopover.isOpen()) {
                     this._oPopover.close();
                 }
                 return;
             }
+
             this.bOnNavigationToResultPage = false;
-            var sValue = event.getParameter("suggestValue");
             this.oSF.focus();
 
-            if (this._recentSearchTermSelected === true) {
-                this._recentSearchTermSelected = false;
-                return;
-            }
             if (this.bOpeningPopOver === true && this._oPopover.isOpen() === true) {
                 this.bOpeningPopOver = false;
                 return;
             }
-            this.testProviders(sValue);
+
+            var sValue = oEvent.getParameter("suggestValue");
+            this._testProviders(sValue);
         },
 
-        onfocusin: function (event) {
+        onfocusin: function (oEvent) {
+
             if (this.oSF.getEnableSuggestions() && Device.system.phone) {
                 // eslint-disable-next-line no-undef
                 jQuery(this.oSF.getDomRef()).find("input").attr("inputmode", "search");
@@ -91,241 +103,548 @@ sap.ui.define([
             }
         },
 
-        getHomePageApps: function () {
-            var that = this;
-            NavigationSvcSearchProvider.execSearch().then(function (oResult) {
-                var sGroupName = "homePageApplications";
-                if (Array.isArray(oResult[sGroupName]) && oResult[sGroupName].length > 0) {
-                    that.oProducts = oResult[sGroupName].slice(0, 12);
-                }
-            });
-        },
+        onSearch: function (oEvent) {
 
-        getScreenSize: function () {
-            var oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
-            if (oScreenSize.from >= 1440) {
-                return "XL";
-            } else if (oScreenSize.from >= 1024) {
-                return "L";
-            } else if (oScreenSize.from >= 600) {
-                return "M";
-            } else if (oScreenSize.from >= 0) {
-                return "S";
-            }
-        },
+            var sSearchTerm = oEvent.getParameter("query"),
+                bEscPressed = oEvent.getParameter("escPressed"),
+                bClearButtonPressed = oEvent.getParameter("clearButtonPressed"),
+                oSearchResultList = Core.byId("SearchResultList");
 
-        onSearch: function (event) {
-            if (this._bEscPressed) {
+            if (bEscPressed) {
+                this._bEscPressed = bEscPressed;
+                if (this.oSF.getValue() || this._oPlaceHolderSF.getValue()) {
+                    this.oSF.setValue("");
+                    this._oPlaceHolderSF.setValue("");
+                } else {
+                    this._oPopover.close();
+                }
                 return;
             }
-            var sSearchTerm = event.getParameter("query"),
-                bClearButtonPressed = event.getParameter("clearButtonPressed");
-            if (bClearButtonPressed === true) {
+
+            if (bClearButtonPressed) {
+
                 this.oSF.setValue("");
                 this._oPlaceHolderSF.setValue("");
                 this.bOpeningPopOver = false;
-                this.testProviders();
-                if (this._oSearchHistoryList.getItems().length === 0 && this._oFrequentlyUsedAppsList.getItems().length === 0 && this._oProductsList.getItems().length === 0) {
+
+                this._testProviders();
+
+                var bClosePopover = true,
+                    aLists = this._oPopover.getContent()[1].getItems();
+
+                for (var nIdx in aLists) {
+                    if (aLists[nIdx].getItems().length) {
+                        bClosePopover = false;
+                    }
+                }
+
+                if (bClosePopover) {
                     this._oPopover.close();
                 }
                 return;
             }
 
             if (sSearchTerm) {
+                sSearchTerm = sSearchTerm.trim();
                 // sync inputs in case esc was pressed and value was entered, cleared and another one entered
                 this._oPlaceHolderSF.setValue(this.oSF.getValue());
-
                 this._saveSearchTerm(sSearchTerm);
-                if (this._bIsMyHome === true) {
-                    if (this._oSearchResultList.getItems().length > 0) {
-                        this._oSearchResultList.getItems()[0].focus();
-                        var sBindingContext = "searchResults";
-                        var sSemanticObject = this._oSearchResultList.getItems()[0].getBindingContext(sBindingContext).getObject().semanticObject;
-                        var sAction = this._oSearchResultList.getItems()[0].getBindingContext(sBindingContext).getObject().semanticObjectAction;
-                        this._navigateApp(sSemanticObject, sAction);
+
+                if (this._bIsMyHome) {
+                    if (oSearchResultList.getItems().length > 0) {
+
+                        var oBindingContext = oSearchResultList.getItems()[0].getBindingContext("resultModel"),
+                            oResult = oBindingContext.getObject();
+
+                        this._navigateToApp(oResult);
                     }
                 } else {
                     this._navigateToResultPage(sSearchTerm);
                 }
+                this._oPopover.close();
             }
         },
 
         onBeforeOpen: function () {
-            this._oPopover.addStyleClass("sapUshellCEPSearchFieldPopover");
-            var sSearchState = Core.byId("shell-header").getSearchState();
-            var bCollapse = false;
+
+            var bCollapse = false,
+                oShellHeader = Core.byId("shell-header"),
+                sSearchState = oShellHeader.getSearchState();
+
             if (sSearchState === "COL") {
                 bCollapse = true;
             }
-            Core.byId("shell-header").setSearchState("EXP", 35, false); // intermediate state to force shell to show overlay
-            Core.byId("shell-header").setSearchState("EXP_S", 35, true);
+
+            this._oPopover.addStyleClass("sapUshellCEPSearchFieldPopover");
+
+            // intermediate state to force shell to show overlay
+            oShellHeader.setSearchState("EXP", 35, false);
+            oShellHeader.setSearchState("EXP_S", 35, true);
+
             if (bCollapse === true) {
-                Core.byId("shell-header").setSearchState("COL", 35, false);
+                oShellHeader.setSearchState("COL", 35, false);
             }
         },
 
         onAfterOpen: function () {
-            if (Core.byId("SearchHistoryList-trigger")) {
-                Core.byId("SearchHistoryList-trigger").addEventDelegate({
-                    onkeydown: this._keyDownSearchHistoryListMoreTrigger.bind(this),
-                    onmousedown: this._mouseDownSearchHistoryListMoreTrigger.bind(this)
-                });
-            }
-            if (Core.byId("FrequentlyUsedAppsList-trigger")) {
-                Core.byId("FrequentlyUsedAppsList-trigger").addEventDelegate({
-                    onkeydown: this._keyDownFrequentlyUsedAppsListMoreTrigger.bind(this)
-                });
-            }
-            if (Core.byId("ProductsList-trigger")) {
-                Core.byId("ProductsList-trigger").addEventDelegate({
-                    onkeydown: this._keyDownProductsListMoreTrigger.bind(this)
-                });
-            }
-
-            // set handlers for screen reader to announce relevant list name
-            if (this._oFrequentlyUsedAppsList.getItems().length > 0) {
-                this._oFrequentlyUsedAppsList.getItems()[0].addEventDelegate({
-                    onkeyup: this._keyUpFrequentlyUsedAppsListMoreTrigger.bind(this)
-                });
-            }
-            if (this._oProductsList.getItems().length > 0) {
-                this._oProductsList.getItems()[0].addEventDelegate({
-                    onkeyup: this._keyUpProductsListMoreTrigger.bind(this)
-                });
-            }
 
             var nPlaceHolderSFHeight = document.getElementById("PlaceHolderSearchField").clientHeight;
             document.getElementById("CEPSearchField").style.height = nPlaceHolderSFHeight + "px";
-
             // add tooltip to CEP Search icon
             jQuery(this.oSF.getDomRef()).find("#CEPSearchField-search").attr("title", resources.i18n.getText("search"));
+            this._removeBottomDivider();
         },
 
-        onAfterClose: function () {
+        onAfterClose: function (oEvent) {
+
+            var oSFicon = Core.byId("sf"),
+                oShellHeader = Core.byId("shell-header"),
+                sScreenSize = this._getScreenSize(),
+                aLists = this._oPopover.getContent()[1].getItems();
+
             this._oPlaceHolderSF.setValue(this.oSF.getValue());
+
             if (this._bEscPressed) {
                 this._bEscPressed = false;
                 this._oPlaceHolderSF.focus();
             }
 
-            var sScreenSize = this.getScreenSize();
             if (sScreenSize !== "XL" && this.oSF.getValue() === "") {
-                Core.byId("shell-header").setSearchState("COL", 35, false);
-                Core.byId("sf").setVisible();
+                oShellHeader.setSearchState("COL", 35, false);
+                oSFicon.setVisible();
             } else {
-                Core.byId("shell-header").setSearchState("EXP", 35, false); // intermediate state to force shell to disable overlay
-                Core.byId("shell-header").setSearchState("EXP_S", 35, false);
+                // intermediate state to force shell to disable overlay
+                oShellHeader.setSearchState("EXP", 35, false);
+                oShellHeader.setSearchState("EXP_S", 35, false);
+            }
+
+            aLists.forEach(function (oList) {
+                var oListConfig = oList._getProviderConfig(),
+                    sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
+                // notify external search providers
+                if (oList.getVisible() && !sGroupName) {
+                    if (typeof oListConfig.popoverClosed === "function") {
+                        var fnPopoverClosedHandler = oListConfig.popoverClosed;
+                        fnPopoverClosedHandler(oEvent);
+                    }
+                }
+            }.bind(this));
+        },
+
+        _listenToServiceEvents: function (oSearchCEPService) {
+
+            EventHub.on("updateExtProviderLists").do(this._updateExtProviderLists.bind(this, oSearchCEPService));
+        },
+
+        _updateExtProviderLists: function (oSearchCEPService) {
+
+            if (this._oPopover) {
+                var oContent = this._oPopover.getContent()[1],
+                    aLists = oContent.getItems(),
+                    pExtProvidersPromise = oSearchCEPService.getExternalSearchProvidersPriorityArray();
+
+                // remove external provider lists
+                for (var idx in aLists) {
+                    var oList = aLists[idx],
+                        oProvider = oList._getProviderConfig(),
+                        sGroupName = this._getDefaultProviderGroupName(oProvider.id);
+
+                    if (!sGroupName) {
+                        oContent.removeItem(oList);
+                        oList.destroy();
+                        this._oResultModel.setProperty("/" + oProvider.name, []);
+                    }
+                }
+
+                if (!Device.support.touch) {
+                    this._sContentDensityClass = "sapUiSizeCompact";
+                } else {
+                    this._sContentDensityClass = "sapUiSizeCozy";
+                }
+
+                // add external provider lists
+                pExtProvidersPromise.then(function (aExtProviders) {
+                    for (var indx in aExtProviders) {
+                        var oExList = this._createList(aExtProviders[indx], undefined);
+                        oExList.addStyleClass(this._sContentDensityClass);
+                        oContent.addItem(oExList);
+                    }
+
+                    if (this._oPopover.isOpen()) {
+                        // fill external provider lists
+                        if (aExtProviders.length) {
+                            this._testProviders(this.oSF.getValue());
+                        }
+                        this._removeBottomDivider();
+                    }
+                }.bind(this));
             }
         },
 
-        onGrowingStarted: function (event) {
-            var nActualItems = event.getParameter("actual");
-            if (nActualItems > 0) {
-                this._oSearchHistoryList.setGrowingThreshold(8);
+        _registerDefaultProviders: function (oSearchCEPService) {
+
+            for (var sKey in SearchProvider.defaultProviders) {
+                oSearchCEPService._registerDefaultSearchProvider(SearchProvider.defaultProviders[sKey]);
+            }
+        },
+
+        _getScreenSize: function () {
+
+            var oScreenSize = Device.media.getCurrentRange(Device.media.RANGESETS.SAP_STANDARD_EXTENDED);
+
+            if (oScreenSize.from >= 1440) {
+                return "XL";
+            } else if (oScreenSize.from >= 1024) {
+                return "L";
+            } else if (oScreenSize.from >= 600) {
+                return "M";
+            } else if (oScreenSize.from >= 0) {
+                return "S";
             }
         },
 
-        onGrowingFinishedResults: function () {
-            this._boldResults(this._oSearchResultList, this.oSF.getValue());
+        _focusNextList: function (oCurrentList) {
+
+            var aLists = this._oPopover.getContent()[1].getItems(),
+                oCurrentListIndex = aLists.map(function (oList) {
+                    return oList.getId();
+                }).indexOf(oCurrentList.getId()),
+                aNextLists = aLists.slice(oCurrentListIndex + 1);
+
+            for (var idx = 0; idx < aNextLists.length; idx++) {
+                if (aNextLists[idx].getVisible() && aNextLists[idx].getItems().length) {
+
+                    var oControl = aNextLists[idx].getItems()[0],
+                        oParent = oControl.getParent(),
+                        oListConfig = oParent._getProviderConfig();
+
+                    oControl.focus();
+                    // add list name to first list item aria text for screen reader to announce relevant list name
+                    this._setListNameToAriaLabelledBy(oControl, oListConfig.title);
+                    break;
+                }
+            }
         },
 
-        onExit: function () {
+        _focusPreviousList: function (oCurrentList) {
+
+            var aLists = this._oPopover.getContent()[1].getItems(),
+                oCurrentListIndex = aLists.map(function (oList) {
+                    return oList.getId();
+                }).indexOf(oCurrentList.getId()),
+                aPreviousLists = aLists.slice(0, oCurrentListIndex);
+
+            if (!aPreviousLists.length) {
+                // focus search field if no previous lists found
+                this.oSF.focus();
+                return;
+            }
+
+            for (var idx = aPreviousLists.length - 1; idx >= 0; idx--) {
+                if (aPreviousLists[idx].getVisible() && aPreviousLists[idx].getItems().length) {
+                    var oListItems = aPreviousLists[idx].getItems(),
+                        oAdditionalItems = document.getElementById(aPreviousLists[idx].getId() + "-triggerList"),
+                        oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
+                    // check if previous list has "more" button
+                    if (oAdditionalItemsStyle.display === "none") {
+                        // focus last item
+                        oListItems[oListItems.length - 1].focus();
+                    } else {
+                        Core.byId(aPreviousLists[idx].getId() + "-trigger").focus();
+                    }
+                    break;
+                }
+
+                if (idx === 0) {
+                    // focus search field if no relevant lists found
+                    this.oSF.focus();
+                }
+            }
         },
 
-        testProviders: function (sQuery) {
-            var arrProviders,
-                idx,
-                that = this,
-                bIsSearch = false,
-                bRecentActivity = false;
-            if (sQuery !== undefined && sQuery !== "" && sQuery.trim().length !== 0) {
-                this._setListsVisible(false, this._oSearchHistoryList);
-                this._setListsVisible(false, this._oFrequentlyUsedAppsList);
-                this._setListsVisible(false, this._oProductsList);
-                arrProviders = [NavigationSvcSearchProvider];
-                bIsSearch = true;
+        _keyDownHandler: function (oEvent) {
+
+            var oControl = oEvent.srcControl,
+                oParent = oControl.getParent(),
+                aCurrentListItems = oParent.getItems();
+
+            if (oEvent.code === 40 || oEvent.code === "ArrowDown") {
+                // if event was triggered on the last item in the list
+                if (aCurrentListItems[aCurrentListItems.length - 1] === oControl) {
+                    var oAdditionalItems = document.getElementById(oParent.getId() + "-triggerList"),
+                        oAdditionalItemsStyle = window.getComputedStyle(oAdditionalItems);
+                    // if no additional items ("More" button), move focus to the first item of the next list
+                    if (oAdditionalItemsStyle.display === "none") {
+                        this._focusNextList(oParent);
+                    }
+                }
+                // if event was triggered on "More" button, move focus to the first item of the next list
+                if (oControl.getId().endsWith("-trigger")) {
+                    this._focusNextList(oParent);
+                }
+            } else if (oEvent.code === 38 || oEvent.code === "ArrowUp") {
+                if (aCurrentListItems[0] === oControl) {
+                    this._focusPreviousList(oParent);
+                }
+            }
+        },
+
+        _setListNameToAriaLabelledBy: function (oControl, sListName) {
+
+            var oCurrentControl = oControl.getDomRef(),
+                sHiddenSpanId = jQuery(oCurrentControl).attr("aria-labelledby"),
+                sText = Core.byId(sHiddenSpanId).getProperty("text");
+
+            jQuery(Core.byId(sHiddenSpanId).getDomRef()).text(sListName + ". " + sText);
+        },
+
+        _getDefaultProviderGroupName: function (sProviderId) {
+
+            var oListGroupMap = {
+                SearchResultList: "applications",
+                FrequentlyUsedAppsList: "frequentApplications",
+                SearchHistoryList: "recentSearches",
+                ProductsList: "homePageApplications",
+                ExternalSearchAppsList: "externalSearchApplications"
+            };
+
+            return oListGroupMap[sProviderId];
+        },
+
+        _removeBottomDivider: function () {
+
+            // remove divider under bottom list
+            setTimeout(function () {
+                var oBottomList = jQuery(this._oPopover.getDomRef()).find(".searchCEPList.sapUshellCEPListDivider").not(":hidden").last();
+                if (oBottomList.length) {
+                    oBottomList.addClass("bottomCEPlist");
+                }
+            }.bind(this), 100);
+        },
+
+        _createList: function (oConfiguration, oModel) {
+
+            var oList = new List({
+                id: oConfiguration.id,
+                showSeparators: "None",
+                headerText: oConfiguration.titleVisible ? oConfiguration.title : "",
+                growing: true,
+                showNoData: oConfiguration.showNoData || false,
+                growingThreshold: oConfiguration.defaultItemCount,
+                growingScrollToLoad: false,
+                items: {
+                    path: "resultModel>/" + oConfiguration.name,
+                    template: (new StandardListItem({
+                        type: "Active",
+                        title: "{resultModel>text}",
+                        icon: "{resultModel>icon}",
+                        iconDensityAware: false
+                    })).addStyleClass("sapUiTinyMarginBeginEnd")
+                },
+
+                growingStarted: this._listUpdateStart.bind(this),
+                updateStarted: this._listUpdateStart.bind(this),
+                itemPress: this._itemPress.bind(this)
+            }).addStyleClass("searchCEPList sapUshellCEPListDivider");
+
+            switch (oConfiguration.id) {
+                case "SearchResultList":
+                    oList.attachUpdateFinished(this._resultListUpdateFinish.bind(this));
+                    break;
+            }
+
+            oList.setModel(oModel, "resultModel");
+            oList._providerConfig = oConfiguration;
+            oList._getProviderConfig = function () {
+                return this._providerConfig;
+            };
+
+            oList.addEventDelegate({
+                onkeydown: this._keyDownHandler.bind(this),
+                onsapdown: this._keyDownHandler.bind(this)
+            });
+
+            return oList;
+        },
+
+        _itemPress: function (oEvent) {
+
+            var fnHandleItemPress,
+                oControl = oEvent.getParameter("srcControl"),
+                oParent = oControl.getParent(),
+                oListConfig = oParent._getProviderConfig(),
+                sGroupName = this._getDefaultProviderGroupName(oListConfig.id);
+
+            if (sGroupName) {
+                // use local handler for default provider
+                sGroupName = sGroupName.charAt(0).toUpperCase() + sGroupName.substring(1);
+                fnHandleItemPress = "_on" + sGroupName + "Press";
+                this[fnHandleItemPress](oEvent);
             } else {
-                this._setListsVisible(false, this._oSearchResultList);
-                this._setListsVisible(false, this._oExternalSearchResultList);
-                if (this._bOnInit !== true) {
-                    arrProviders = [FrequentActivityProvider, RecentSearchProvider];
-                    if (this._oProductsList.getItems().length > 0) {
-                        this._setListsVisible(true, this._oProductsList);
-                        bRecentActivity = true;
+                // use configuration handler for external provider
+                fnHandleItemPress = oListConfig.itemPress;
+                fnHandleItemPress(oEvent);
+
+                // handle custom press event for specific item
+                var iControlIdx = oParent.getItems().indexOf(oControl),
+                    aModelListItems = this._oResultModel.getProperty("/" + oListConfig.name),
+                    oModelListItem = aModelListItems[iControlIdx];
+
+                if (oModelListItem.hasOwnProperty("press") && typeof oModelListItem.press === "function") {
+                    fnHandleItemPress = oModelListItem.press;
+                    fnHandleItemPress(oEvent);
+                }
+            }
+        },
+
+        _listUpdateStart: function (oEvent) {
+
+            var oList = oEvent.getSource(),
+                oConfiguration = oList._getProviderConfig(),
+                iActualItems = oEvent.getParameter("actual"),
+                sReason = oEvent.getParameter("reason"),
+                iThreshold = this.bGrowingReset ? oConfiguration.maxItemCount : oConfiguration.defaultItemCount;
+            /*
+            * Currently UI5 List fires both deprecated and its new alternative events (growingStarted -> updateStarted).
+            * updateStarted fires before growingStarted, so all of its changes are overwritten.
+            * For the time being we should handle both events in the same way.
+            */
+            if (iActualItems && iActualItems > 0) {
+                if (sReason) {
+                    // updateStart
+                    switch (sReason.toLowerCase()) {
+                        case "growing":
+                            // reset property for new threshold to take effect
+                            this.bGrowingReset = true;
+                            var oProperty = this._oResultModel.getProperty("/" + oConfiguration.name);
+                            this._oResultModel.setProperty("/" + oConfiguration.name, []);
+                            this._oResultModel.setProperty("/" + oConfiguration.name, oProperty);
+                            oList.setGrowingThreshold(oConfiguration.maxItemCount);
+                            break;
+                        case "change":
+                            oList.setGrowingThreshold(iThreshold);
+                            break;
                     }
                 } else {
-                    if (Array.isArray(this.oProducts) && this.oProducts.length > 0) {
-                        bRecentActivity = true;
-                        this._setListsVisible(true, this._oProductsList);
-                        this._oProductsList.setModel(new JSONModel(this.oProducts), "productsResults");
-                        arrProviders = [FrequentActivityProvider, RecentSearchProvider];
-                    } else {
-                        arrProviders = [NavigationSvcSearchProvider, FrequentActivityProvider, RecentSearchProvider];
-                    }
-                    this._bOnInit = false;
+                    // deprecated growingStart
+                    oList.setGrowingThreshold(iThreshold);
                 }
+                this._removeBottomDivider();
+            }
+        },
+
+        _resultListUpdateFinish: function (oEvent) {
+
+            var oList = oEvent.getSource(),
+                oConfiguration = oList._getProviderConfig(),
+                sQuery = oList.getModel("resultModel").getProperty("/query");
+
+            if (oConfiguration.highlightResult && oConfiguration.highlightResult === true) {
+                var oResults = oList.$().find(".sapMSLITitleOnly");
+
+                jQuery.each(oResults, function (oConfiguration, index) {
+                    var sRegex = new RegExp(sQuery, "gi"),
+                        // remove <b> from previous highlighting
+                        sCleanText = oResults[index].innerHTML.replace(/<[^>]*>/g, ""),
+                        sBoldTitle = sCleanText.replace(sRegex, function (oConfiguration, sPart) {
+                            return this._getBoldTitle(oConfiguration, sPart);
+                        }.bind(this, oConfiguration));
+                    oResults[index].innerHTML = this._getHighlightedHtml(oConfiguration, sBoldTitle);
+                }.bind(this, oConfiguration));
+            }
+        },
+
+        _getBoldTitle: function (oConfiguration, sPart) {
+
+            if (oConfiguration.highlightSearchStringPart && oConfiguration.highlightSearchStringPart === true) {
+                return "<b>" + sPart + "</b>";
+            }
+            return "</b>" + sPart + "<b>";
+        },
+
+        _getHighlightedHtml: function (oConfiguration, sBoldTitle) {
+
+            if (!oConfiguration.highlightSearchStringPart || oConfiguration.highlightSearchStringPart !== true) {
+                return "<b>" + sBoldTitle + "</b>";
+            }
+            return sBoldTitle;
+        },
+
+        _testProviders: function (sQuery) {
+
+            if (!this._oResultModel) {
+                this._oResultModel = new JSONModel({});
+                this._oPopover.setModel(this._oResultModel, "resultModel");
+            }
+
+            var oModel = this._oResultModel,
+                iQueryLength = (sQuery || "").trim().length,
+                aLists = this._oPopover.getContent()[1].getItems();
+
+            oModel.setProperty("/query", sQuery);
+
+            if (!Device.support.touch) {
+                this._sContentDensityClass = "sapUiSizeCompact";
+            } else {
+                this._sContentDensityClass = "sapUiSizeCozy";
             }
-            for (idx = 0; idx < arrProviders.length; idx++) {
-                (function (oProvider) {
-                    oProvider.execSearch(sQuery).then(function (oResult) {
-                        for (var groupId in SearchProvider.GROUP_TYPE) {
-                            var sGroupName = SearchProvider.GROUP_TYPE[groupId];
-                            if (Array.isArray(oResult[sGroupName]) && oResult[sGroupName].length > 0) {
-                                if (sGroupName === "recentSearches") {
-                                    bRecentActivity = true;
-                                    that._setListsVisible(true, that._oSearchHistoryList);
-                                    that._oSearchHistoryList.setGrowingThreshold(2);
-                                    that._oSearchHistoryList.setModel(new JSONModel(oResult[sGroupName].slice(0, 10)), "searchTerms");
-                                } else if (sGroupName === "frequentApplications") {
-                                    bRecentActivity = true;
-                                    that._setListsVisible(true, that._oFrequentlyUsedAppsList);
-                                    that._oFrequentlyUsedAppsList.setModel(new JSONModel(oResult[sGroupName].slice(0, 12)), "freqUsedApps");
-                                } else if (bIsSearch !== true && sGroupName === "homePageApplications") {
-                                    bRecentActivity = true;
-                                    that._setListsVisible(true, that._oProductsList);
-                                    that._oProductsList.setModel(new JSONModel(oResult[sGroupName].slice(0, 12)), "productsResults");
-                                } else if (bIsSearch === true && sGroupName === "applications") {
-                                    that._setListsVisible(true, that._oSearchResultList);
-                                    that._oSearchResultList.setModel(new JSONModel(oResult[sGroupName].slice(0, 12)), "searchResults");
-                                    that._applyResultsAcc(oResult[sGroupName].length);
-                                    setTimeout(function () {
-                                        that._boldResults(that._oSearchResultList, sQuery);
-                                        if (Core.byId("SearchResultList-trigger")) {
-                                            Core.byId("SearchResultList-trigger").addEventDelegate({
-                                                onkeydown: that._keyDownSearchResultListMoreTrigger.bind(that)
-                                            });
-                                        }
-                                    }, 50);
-                                } else if (bIsSearch === true && sGroupName === "externalSearchApplications") {
-                                    that._setListsVisible(true, that._oExternalSearchResultList);
-                                    that._oExternalSearchResultList.setModel(new JSONModel(oResult[sGroupName].slice(0, 12)), "externalSearchResults");
-                                }
-                                if (!that._oPopover.isOpen() && (bRecentActivity === true || bIsSearch === true)) {
-                                    that._toggleSearchPopover(true);
-                                }
-                                that.oSF.focus();
-                            } else if (!that._oPopover.isOpen() && bRecentActivity === true && that._oProductsList.getItems().length > 0) {
-                                that._toggleSearchPopover(true);
-                            } else if (bIsSearch === true && sGroupName === "applications") {
-                                if (!oResult[sGroupName] || oResult[sGroupName].length === 0) {
-                                    that._setListsVisible(true, that._oSearchResultList);
-                                    that._oSearchResultList.setModel(new JSONModel({}), "searchResults");
-                                    that._applyResultsAcc(0);
+
+            for (var idx in aLists) {
+                var oList = aLists[idx],
+                    oProvider = oList._getProviderConfig(),
+                    sGroupName = this._getDefaultProviderGroupName(oProvider.id);
+
+                oList.setVisible(false);
+
+                if (iQueryLength >= oProvider.minQueryLength && iQueryLength <= oProvider.maxQueryLength) {
+
+                    oProvider.execSearch(sQuery, sGroupName).then(function (oListRef, oProviderRef, aResult) {
+
+                        if (aResult && Array.isArray(aResult) && aResult.length > 0) {
+
+                            // trigger list update after popover is reopened (native events are not firing)
+                            if (oModel.getProperty("/" + oProviderRef.name)) {
+                                this.bGrowingReset = false;
+                                oModel.setProperty("/" + oProviderRef.name, []);
+                            }
+
+                            oListRef.setVisible(true);
+                            if (!this._oPopover.isOpen()) {
+                                this._toggleSearchPopover(true);
+                            }
+
+                            var aResultItems = aResult.slice(0, oProviderRef.maxItemCount);
+                            oModel.setProperty("/" + oProviderRef.name, aResultItems);
+
+                            // custom behavior for default providers
+                            switch (oListRef.getId()) {
+                                case "SearchResultList":
+                                    this._applyResultsAcc(aResultItems.length);
+                                    break;
+                            }
+                            this.oSF.focus();
+                        }  else {
+                            oModel.setProperty("/" + oProviderRef.name, []);
+                            // custom behavior for default providers
+                            switch (oListRef.getId()) {
+                                case "SearchResultList":
+                                    this._applyResultsAcc(0);
                                     var sNoResults = resources.i18n.getText("no_apps_found", [sQuery]);
-                                    that._oSearchResultList.setNoDataText(sNoResults);
-                                    if (!that._oPopover.isOpen()) {
-                                        that._toggleSearchPopover(true);
-                                    }
-                                }
+                                    oListRef.setNoDataText(sNoResults);
+                                    oListRef.setVisible(true);
+                                    break;
                             }
                         }
-                    });
-                })(arrProviders[idx]);
+                    }.bind(this, oList, oProvider));
+                }
             }
+            this._removeBottomDivider();
         },
 
         _applyResultsAcc: function (iNumOfItems) {
+
             var sAriaText = "";
+
             // add items to list
             if (iNumOfItems === 1) {
                 sAriaText = resources.i18n.getText("one_result_search_aria", iNumOfItems);
@@ -338,36 +657,25 @@ sap.ui.define([
             this.oSF.$("SuggDescr").text(sAriaText);
         },
 
-        _boldResults: function (oList, sQuery) {
-            var oItems = oList.getItems(),
-                inputText = oList.$().find(".sapMSLITitleOnly");
-            jQuery.each(inputText, function (i) {
-                var sTitle = oItems[i].getTitle(),
-                    reg = new RegExp(sQuery, 'gi');
-                var sBoldTitle = sTitle;
-                sBoldTitle = sBoldTitle.replace(reg, function (str) {
-                    return '</b>' + str + '<b>';
-                });
-                sBoldTitle = '<b>' + sBoldTitle + '</b>';
-                inputText[i].innerHTML = sBoldTitle;
-            });
-        },
-
         _toggleSearchPopover: function (bOpen) {
+
             if (!this._oPopover) {
                 Fragment.load({
                     name: "sap.ushell.components.shell.SearchCEP.SearchFieldFragment",
                     type: "XML",
                     controller: this
                 }).then(function (popover) {
+
                     this._oPopover = popover;
-                    var sScreenSize = this.getScreenSize();
-                    var nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
+                    var sScreenSize = this._getScreenSize(),
+                        nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
+
                     if (sScreenSize === "S") {
                         nPlaceHolderSFWidth = 1.1 * nPlaceHolderSFWidth;
                     } else {
                         nPlaceHolderSFWidth = 1.05 * nPlaceHolderSFWidth;
                     }
+
                     this._oPopover.setContentWidth(nPlaceHolderSFWidth + "px");
                     if (Configuration.getRTL() === true) {
                         var nOffsetX = this._oPopover.getOffsetX();
@@ -375,23 +683,9 @@ sap.ui.define([
                     }
 
                     this._initializeSearchField();
-                    this._initializeSearchHistoryList();
-                    this._initializeFrequentlyUsedAppsList();
-                    this._initializeSearchResultList();
-                    this._initializeProductsList();
-                    this._initializeExternalSearchResultList();
-                    if (!Device.support.touch) {
-                        this._sContentDensityClass = "sapUiSizeCompact";
-                    } else {
-                        this._sContentDensityClass = "sapUiSizeCozy";
-                    }
-                    this._oSearchHistoryList.addStyleClass(this._sContentDensityClass);
-                    this._oFrequentlyUsedAppsList.addStyleClass(this._sContentDensityClass);
-                    this._oSearchResultList.addStyleClass(this._sContentDensityClass);
-                    this._oProductsList.addStyleClass(this._sContentDensityClass);
-                    this._oExternalSearchResultList.addStyleClass(this._sContentDensityClass);
-                    this.testProviders();
-                    this._toggleSearchPopover(bOpen);
+                    this._initLists().then(function () {
+                        this._testProviders();
+                    }.bind(this));
                 }.bind(this));
             } else if (bOpen) {
                 this._oPopover.openBy(this._oPlaceHolderSF);
@@ -402,264 +696,86 @@ sap.ui.define([
             }
         },
 
-        _keyDownSearchField: function (event) {
-            if (event.code === 40 || event.code === "ArrowDown") {
-                this.oSF.focus();
-                if (!this._oPopover.isOpen()) {
-                    this._toggleSearchPopover(true);
-                }
-                if (this._oSearchHistoryList.getVisible() === true && this._oSearchHistoryList.getItems().length > 0) {
-                    this._oSearchHistoryList.getItems()[0].focus();
-                } else if (this._oFrequentlyUsedAppsList.getVisible() === true && this._oFrequentlyUsedAppsList.getItems().length > 0) {
-                    this._oFrequentlyUsedAppsList.getItems()[0].focus();
-                } else if (this._oProductsList.getVisible() === true && this._oProductsList.getItems().length > 0) {
-                    this._oProductsList.getItems()[0].focus();
-                } else if (this._oSearchResultList.getVisible() === true && this._oSearchResultList.getItems().length > 0) {
-                    this._oSearchResultList.getItems()[0].focus();
-                } else if (this._oExternalSearchResultList.getVisible() === true && this._oExternalSearchResultList.getItems().length > 0) {
-                    this._oExternalSearchResultList.getItems()[0].focus();
-                }
-            } else if (event.code === 116 || event.code === "F5") {
-                window.location.reload();
-            } else if (event.code === 9 || event.code === "Tab") {
-                var element;
-                if (event.shiftKey) {
-                    element = this._oPlaceHolderSF.oParent.getDomRef().firstChild.lastChild.firstChild;
-                } else {
-                    element = this._oPlaceHolderSF.oParent.getDomRef().lastChild.firstChild;
-                    if (element && getComputedStyle(element).display === "none") {
-                        element = this._oPlaceHolderSF.oParent.getDomRef().lastChild.firstChild.nextSibling;
-                    }
-                }
-                setTimeout(function () {
-                    if (this.getScreenSize() === "S" || this.getScreenSize() === "M") {
-                        Core.byId("shell-header").setSearchState("COL", 35, false);
-                        Core.byId("sf").setVisible(true);
-                    }
-                    if (element !== null) {
-                        element.focus();
-                    }
-                }.bind(this), 0);
-            } else if (event.code === 27 || event.code === "Escape") {
-                this.oSF.setValue("");
-                this._oPlaceHolderSF.setValue("");
-                this._bEscPressed = true;
-            }
-        },
+        _initLists: function () {
 
-        _keyDownSearchHistoryList: function (event) {
-            var nNumOfItemsHistoryList = this._oSearchHistoryList.getItems().length;
-            if (event.code === 40 || event.code === "ArrowDown") {
-                if (nNumOfItemsHistoryList > 0 && this._oSearchHistoryList.getItems()[nNumOfItemsHistoryList - 1] === event.srcControl) {
-                    var searchHistoryStyle = window.getComputedStyle(document.getElementById("SearchHistoryList-triggerList"), "");
-                    if (searchHistoryStyle.display === "none") {
-                        if (this._oFrequentlyUsedAppsList.getVisible() === true && this._oFrequentlyUsedAppsList.getItems().length > 0) {
-                            this._oFrequentlyUsedAppsList.getItems()[0].focus();
-                        } else if (this._oProductsList.getVisible() === true && this._oProductsList.getItems().length > 0) {
-                            this._oProductsList.getItems()[0].focus();
-                        }
-                    } else {
-                        Core.byId("SearchHistoryList-trigger").focus();
-                    }
-                }
-            } else if (event.code === 38 || event.code === "ArrowUp") {
-                if (nNumOfItemsHistoryList > 0 && this._oSearchHistoryList.getItems()[0] === event.srcControl) {
-                    this.oSF.focus();
-                }
-            }
-        },
+            return this._SearchCEPService.then(function (oSearchCEPService) {
 
-        _keyDownFrequentlyUsedAppsList: function (event) {
-            var frequentlyUsedStyle,
-                nNumOfItemsFreqUsedAppsList = this._oFrequentlyUsedAppsList.getItems().length;
-            if (event.code === 40 || event.code === "ArrowDown") {
-                if (nNumOfItemsFreqUsedAppsList > 0 && this._oFrequentlyUsedAppsList.getItems()[nNumOfItemsFreqUsedAppsList - 1] === event.srcControl) {
-                    frequentlyUsedStyle = window.getComputedStyle(document.getElementById("FrequentlyUsedAppsList-triggerList"), "");
-                    if (frequentlyUsedStyle.display === "none") {
-                        if (this._oProductsList.getVisible() === true && this._oProductsList.getItems().length > 0) {
-                            this._oProductsList.getItems()[0].focus();
-                        }
-                    } else {
-                        Core.byId("FrequentlyUsedAppsList-trigger").focus();
-                    }
-                }
-            } else if (event.code === 38 || event.code === "ArrowUp") {
-                if (nNumOfItemsFreqUsedAppsList > 0 && this._oFrequentlyUsedAppsList.getItems()[0] === event.srcControl) {
-                    var nNumOfItemsHistoryList = this._oSearchHistoryList.getItems().length;
-                    if (this._oSearchHistoryList.getVisible() === true && nNumOfItemsHistoryList > 0) {
-                        var sSearchHistoryListStyle = window.getComputedStyle(document.getElementById("SearchHistoryList-triggerList"), "");
-                        if (sSearchHistoryListStyle.display === "none") {
-                            if (nNumOfItemsHistoryList > 0) {
-                                this._oSearchHistoryList.getItems()[nNumOfItemsHistoryList - 1].focus();
-                            }
-                        } else {
-                            Core.byId("SearchHistoryList-trigger").focus();
-                        }
-                    } else {
-                        this.oSF.focus();
-                    }
-                }
-            } else if (event.code === 13 || event.code === "Enter") {
-                var sAppId = event.srcControl.getBindingContext("freqUsedApps").getObject().appId;
-                var sSemanticObj = sAppId.split("-")[0];
-                sSemanticObj = sSemanticObj.split("#")[1];
-                var sAction = sAppId.split("-")[1];
-                this._navigateApp(sSemanticObj, sAction);
-            }
-        },
-
-        _keyDownProductsList: function (event) {
-            var style,
-                nNumOfItemsProducts = this._oProductsList.getItems().length,
-                nNumOfItemsFreqUsedApps = this._oFrequentlyUsedAppsList.getItems().length,
-                nNumOfItemsHistoryList = this._oSearchHistoryList.getItems().length;
-            if (event.code === 40 || event.code === "ArrowDown") {
-                if (nNumOfItemsProducts > 0 && this._oProductsList.getItems()[nNumOfItemsProducts - 1] === event.srcControl) {
-                    style = window.getComputedStyle(document.getElementById("ProductsList-triggerList"), "");
-                    if (style.display !== "none") {
-                        Core.byId("ProductsList-trigger").focus();
-                    }
-                }
-            } else if (event.code === 38 || event.code === "ArrowUp") {
-                if (nNumOfItemsProducts > 0 && this._oProductsList.getItems()[0] === event.srcControl) {
-                    if (this._oFrequentlyUsedAppsList.getVisible() === true && nNumOfItemsFreqUsedApps > 0) {
-                        style = window.getComputedStyle(document.getElementById("FrequentlyUsedAppsList-triggerList"), "");
-                        if (style.display === "none") {
-                            this._oFrequentlyUsedAppsList.getItems()[nNumOfItemsFreqUsedApps - 1].focus();
-                        } else {
-                            Core.byId("FrequentlyUsedAppsList-trigger").focus();
-                        }
-                    } else if (this._oSearchHistoryList.getVisible() === true && nNumOfItemsHistoryList > 0) {
-                        style = window.getComputedStyle(document.getElementById("SearchHistoryList-triggerList"), "");
-                        if (style.display === "none") {
-                            this._oSearchHistoryList.getItems()[nNumOfItemsHistoryList - 1].focus();
-                        } else {
-                            Core.byId("SearchHistoryList-trigger").focus();
-                        }
-                    } else {
-                        this.oSF.focus();
-                    }
-                }
-            } else if (event.code === 13 || event.code === "Enter") {
-                this.onProductsPress(event);
-            }
-        },
-
-        _keyUpFrequentlyUsedAppsListMoreTrigger: function (event) {
-            var oCurrentControl = event.srcControl.getDomRef(),
-                sHiddenSpanId = oCurrentControl.getAttribute("aria-labelledby"),
-                sText = Core.byId(sHiddenSpanId).getProperty("text"),
-                sNewText = resources.i18n.getText("frequentAppsCEPSearch");
+                var pProvidersPromise = oSearchCEPService.getSearchProvidersPriorityArray(),
+                    oContent = this._oPopover.getContent()[1];
 
-            jQuery(Core.byId(sHiddenSpanId).getDomRef()).text(sNewText + ". " + sText);
-        },
-
-        _keyUpProductsListMoreTrigger: function (event) {
-            var oCurrentControl = event.srcControl.getDomRef(),
-                sHiddenSpanId = oCurrentControl.getAttribute("aria-labelledby"),
-                sText = Core.byId(sHiddenSpanId).getProperty("text"),
-                sNewText = resources.i18n.getText("products");
-
-            jQuery(Core.byId(sHiddenSpanId).getDomRef()).text(sNewText + ". " + sText);
-        },
-
-        _keyDownSearchHistoryListMoreTrigger: function (event) {
-            if (event.code === 40 || event.code === "ArrowDown") {
-                if (this._oFrequentlyUsedAppsList.getVisible() === true && this._oFrequentlyUsedAppsList.getItems().length > 0) {
-                    this._oFrequentlyUsedAppsList.getItems()[0].focus();
-                } else if (this._oProductsList.getVisible() === true && this._oProductsList.getItems().length > 0) {
-                    this._oProductsList.getItems()[0].focus();
-                }
-            } else if (event.code === 38 || event.code === "ArrowUp") {
-                var nNumOfItemsHistoryList = this._oSearchHistoryList.getItems().length;
-                if (nNumOfItemsHistoryList > 0) {
-                    this._oSearchHistoryList.getItems()[nNumOfItemsHistoryList - 1].focus();
+                if (!Device.support.touch) {
+                    this._sContentDensityClass = "sapUiSizeCompact";
+                } else {
+                    this._sContentDensityClass = "sapUiSizeCozy";
                 }
-            } else if (event.code === 13 || event.code === "Enter") {
-                this._oSearchHistoryList.setGrowingThreshold(8);
-            }
-        },
 
-        _mouseDownSearchHistoryListMoreTrigger: function (event) {
-            this._oSearchHistoryList.setGrowingThreshold(8);
+                return pProvidersPromise.then(function (aProviders) {
+                    for (var i = 0; i < aProviders.length; i++) {
+                        var oList = this._createList(aProviders[i], this._oResultModel);
+                        oList.addStyleClass(this._sContentDensityClass);
+                        oContent.addItem(oList);
+                    }
+                }.bind(this));
+            }.bind(this));
         },
 
-        _keyDownFrequentlyUsedAppsListMoreTrigger: function (event) {
-            if (event.code === 38 || event.code === "ArrowUp") {
-                var nNumOfItemsFreqUsedAppsList = this._oFrequentlyUsedAppsList.getItems().length;
-                if (nNumOfItemsFreqUsedAppsList > 0) {
-                    this._oFrequentlyUsedAppsList.getItems()[nNumOfItemsFreqUsedAppsList - 1].focus();
-                }
-            } else if (event.code === 40 || event.code === "ArrowDown") {
-                if (this._oProductsList.getVisible() === true && this._oProductsList.getItems().length > 0) {
-                    this._oProductsList.getItems()[0].focus();
-                }
-            }
-        },
+        _keyDownSearchField: function (oEvent) {
 
-        _keyDownProductsListMoreTrigger: function (event) {
-            if (event.code === 38 || event.code === "ArrowUp") {
-                var nNumOfItemsProductsList = this._oProductsList.getItems().length;
-                if (nNumOfItemsProductsList > 0) {
-                    this._oProductsList.getItems()[nNumOfItemsProductsList - 1].focus();
-                }
-            }
-        },
+            if (oEvent.code === 40 || oEvent.code === "ArrowDown") {
+                this.oSF.focus();
+                var aLists = this._oPopover.getContent()[1].getItems();
 
-        _keyDownSearchResultListMoreTrigger: function (event) {
-            if (event.code === 38 || event.code === "ArrowUp") {
-                var nNumOfItemsSearchResultList = this._oSearchResultList.getItems().length;
-                if (nNumOfItemsSearchResultList > 0) {
-                    this._oSearchResultList.getItems()[nNumOfItemsSearchResultList - 1].focus();
-                }
-            } else if (event.code === 40 || event.code === "ArrowDown") {
-                if (this._oExternalSearchResultList.getVisible() === true && this._oExternalSearchResultList.getItems().length > 0) {
-                    this._oExternalSearchResultList.getItems()[0].focus();
-                }
-            }
-        },
+                for (var sListKey in aLists) {
+                    if (aLists[sListKey].getVisible() && aLists[sListKey].getItems().length > 0) {
+
+                        var oControl = aLists[sListKey].getItems()[0],
+                            oParent = oControl.getParent(),
+                            oListConfig = oParent._getProviderConfig();
 
-        _keyDownSearchResultList: function (event) {
-            var nNumOfItemsSearchResultList = this._oSearchResultList.getItems().length;
-            if (event.code === 40 || event.code === "ArrowDown") {
-                if (nNumOfItemsSearchResultList > 0 && this._oSearchResultList.getItems()[nNumOfItemsSearchResultList - 1] === event.srcControl) {
-                    var style = window.getComputedStyle(document.getElementById("SearchResultList-triggerList"), "");
-                    if (style.display !== "none") {
-                        Core.byId("SearchResultList-trigger").focus();
-                    } else if (this._oExternalSearchResultList.getVisible() === true && this._oExternalSearchResultList.getItems().length > 0) {
-                        this._oExternalSearchResultList.getItems()[0].focus();
+                        oControl.focus();
+                        this._setListNameToAriaLabelledBy(oControl, oListConfig.title);
+                        break;
                     }
                 }
-            } else if (event.code === 38 || event.code === "ArrowUp") {
-                if (nNumOfItemsSearchResultList > 0 && this._oSearchResultList.getItems()[0] === event.srcControl) {
-                    this.oSF.focus();
-                }
-            }
-        },
-
-        _keyDownExternalSearchResultList: function (event) {
-            var nNumOfItemsExternal = this._oExternalSearchResultList.getItems().length,
-                nNumOfAppsResultList = this._oSearchResultList.getItems().length,
-                style = "";
-            if (event.code === 38 || event.code === "ArrowUp") {
-                if (nNumOfItemsExternal > 0 && this._oExternalSearchResultList.getItems()[0] === event.srcControl) {
-                    if (this._oSearchResultList.getVisible() === true && nNumOfAppsResultList > 0) {
-                        style = window.getComputedStyle(document.getElementById("SearchResultList-triggerList"), "");
-                        if (style.display === "none") {
-                            this._oSearchResultList.getItems()[nNumOfAppsResultList - 1].focus();
-                        } else {
-                            Core.byId("SearchResultList-trigger").focus();
+            } else if (oEvent.code === 116 || oEvent.code === "F5") {
+                window.location.reload();
+            } else if (oEvent.code === 9 || oEvent.code === "Tab") {
+                var oElement;
+                if (oEvent.shiftKey) {
+                    oElement = this._oPlaceHolderSF.oParent.getDomRef().firstChild.lastChild.firstChild;
+                } else {
+                    // sapUshellShellHeadEnd area
+                    var oSapUshellShellHeadEnd = this._oPlaceHolderSF.oParent.getDomRef().lastChild,
+                        aChildNodes = oSapUshellShellHeadEnd.childNodes;
+                    // iterate until visible child found
+                    for (var sChildKey in aChildNodes) {
+                        if (getComputedStyle(aChildNodes[sChildKey]).display !== "none") {
+                            oElement = aChildNodes[sChildKey];
+                            break;
                         }
-                    } else {
-                        this.oSF.focus();
                     }
                 }
+                setTimeout(function () {
+                    if (this._getScreenSize() === "S" || this._getScreenSize() === "M") {
+                        Core.byId("shell-header").setSearchState("COL", 35, false);
+                        Core.byId("sf").setVisible(true);
+                    }
+                    if (oElement) {
+                        oElement.focus();
+                    }
+                }.bind(this), 0);
+            } else if (oEvent.code === 27 || oEvent.code === "Escape") {
+                this.oSF.setValue("");
+                this._oPlaceHolderSF.setValue("");
+                this._bEscPressed = true;
             }
         },
 
         _initializeSearchField: function () {
+
             this.oSF = Core.byId("CEPSearchField");
             var nPlaceHolderSFWidth = document.getElementById("PlaceHolderSearchField").clientWidth;
+
             this.oSF.setWidth(nPlaceHolderSFWidth + "px");
             this.oSF.addEventDelegate({
                 onkeydown: this._keyDownSearchField.bind(this),
@@ -667,165 +783,82 @@ sap.ui.define([
             });
         },
 
-        _initializeSearchHistoryList: function () {
-            this._oSearchHistoryList = Core.byId("SearchHistoryList");
-            this._oSearchHistoryList.addEventDelegate({
-                onkeydown: this._keyDownSearchHistoryList.bind(this),
-                onsapdown: this._keyDownSearchHistoryList.bind(this)
-            });
-        },
-
-        _initializeFrequentlyUsedAppsList: function () {
-            this._oFrequentlyUsedAppsList = Core.byId("FrequentlyUsedAppsList");
-            this._oFrequentlyUsedAppsList.setHeaderText(resources.i18n.getText("frequentAppsCEPSearch"));
-            this._oFrequentlyUsedAppsList.addEventDelegate({
-                onkeydown: this._keyDownFrequentlyUsedAppsList.bind(this),
-                onsapdown: this._keyDownFrequentlyUsedAppsList.bind(this)
-            });
-        },
-
-        _initializeSearchResultList: function () {
-            this._oSearchResultList = Core.byId("SearchResultList");
-            this._oSearchResultList.addEventDelegate({
-                onkeydown: this._keyDownSearchResultList.bind(this),
-                onsapdown: this._keyDownSearchResultList.bind(this)
-            });
-        },
-
-        _initializeProductsList: function () {
-            this._oProductsList = Core.byId("ProductsList");
-            this._oProductsList.setHeaderText(resources.i18n.getText("products"));
-            this._oProductsList.addEventDelegate({
-                onkeydown: this._keyDownProductsList.bind(this),
-                onsapdown: this._keyDownProductsList.bind(this)
-            });
-        },
-
-        _initializeExternalSearchResultList: function () {
-            this._oExternalSearchResultList = Core.byId("ExternalSearchAppsList");
-            this._oExternalSearchResultList.setHeaderText(resources.i18n.getText("searchWithin"));
-            this._oExternalSearchResultList.addEventDelegate({
-                onkeydown: this._keyDownExternalSearchResultList.bind(this)
-            });
-        },
-
         _saveSearchTerm: function (sTerm) {
+
             if (sTerm) {
                 sap.ushell.Container.getServiceAsync("UserRecents")
                     .then(function (UserRecentsService) {
-                        UserRecentsService.addSearchActivity({
-                            sTerm: sTerm
-                        }).then(function () {
-                            return;
-                        });
+                        UserRecentsService.addSearchActivity({ sTerm: sTerm });
                     });
             }
         },
 
-        onRecentSearchPress: function (event) {
-            var searchTerm = event.getParameter("listItem").getProperty("title");
-            this._recentSearchTermSelected = true;
+        _onRecentSearchesPress: function (oEvent) {
+
+            var searchTerm = oEvent.getParameter("listItem").getProperty("title");
+
             this.oSF.setValue(searchTerm);
-            this.testProviders(searchTerm);
+            setTimeout(function () {
+                this._testProviders(searchTerm);
+            }.bind(this));
         },
 
-        onSearchResultPress: function (event) {
-            var sSearchTerm = this.oSF.getValue();
+        _onApplicationsPress: function (oEvent) {
+
+            var sSearchTerm = this.oSF.getValue(),
+                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
+                oResult = oBindingContext.getObject();
+
             this._saveSearchTerm(sSearchTerm);
-            var sBindingContext = "searchResults";
-            var sSemanticObject = event.getParameter("listItem").getBindingContext(sBindingContext).getObject().semanticObject;
-            var sAction = event.getParameter("listItem").getBindingContext(sBindingContext).getObject().semanticObjectAction;
-            this._navigateApp(sSemanticObject, sAction);
+            this._navigateToApp(oResult);
         },
 
-        onProductsPress: function (event) {
-            var sSearchTerm = this.oSF.getValue();
+        _onHomePageApplicationsPress: function (oEvent) {
+
+            var sSearchTerm = this.oSF.getValue(),
+                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
+                oResult = oBindingContext.getObject();
+
             this._saveSearchTerm(sSearchTerm);
-            var sBindingContext = "productsResults";
-            var sSemanticObject = event.getParameter("listItem").getBindingContext(sBindingContext).getObject().semanticObject;
-            var sAction = event.getParameter("listItem").getBindingContext(sBindingContext).getObject().semanticObjectAction;
-            this._navigateApp(sSemanticObject, sAction);
+            this._navigateToApp(oResult);
         },
 
-        onExternalSearchResultPress: function (event) {
-            var sSearchTerm = this.oSF.getValue();
+        _onExternalSearchApplicationsPress: function (oEvent) {
+
+            var sSearchTerm = this.oSF.getValue(),
+                oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
+                oResult = oBindingContext.getObject();
+
             this._saveSearchTerm(sSearchTerm);
             // Navigate to ES from search within list
-            if (event.getParameter("listItem").getBindingContext("externalSearchResults").getObject().isEnterpriseSearch === true) {
+            if (oResult && oResult.isEnterpriseSearch === true) {
                 this._navigateToResultPage(sSearchTerm, true);
             } else {
-                var sUrl = event.getParameter("listItem").getBindingContext("externalSearchResults").getObject().url;
-                if (sUrl !== undefined && sUrl !== null) {
-                    this._navigateURL(sUrl);
-                }
+                this._navigateToApp(oResult, sSearchTerm);
             }
         },
 
-        onFreqUsedAppsPress: function (event) {
-            var sAppId = event.getParameter("listItem").getBindingContext("freqUsedApps").getObject().appId;
-            var sSemanticObj = sAppId.split("-")[0];
-            sSemanticObj = sSemanticObj.split("#")[1];
-            var sAction = sAppId.split("-")[1];
-            this._navigateApp(sSemanticObj, sAction);
-            if (this._oPopover.isOpen()) {
-                this._oPopover.close();
-            }
-        },
+        _onFrequentApplicationsPress: function (oEvent) {
+
+            var oBindingContext = oEvent.getParameter("listItem").getBindingContext("resultModel"),
+                oResult = oBindingContext.getObject();
 
-        onFreqUsedProductsPress: function (event) {
-            var sAppId = event.getParameter("listItem").getBindingContext("freqUsedProducts").getObject().appId;
-            var sSemanticObj = sAppId.split("-")[0];
-            sSemanticObj = sSemanticObj.split("#")[1];
-            var sAction = sAppId.split("-")[1];
-            this._navigateApp(sSemanticObj, sAction);
+            this._navigateToApp(oResult);
             if (this._oPopover.isOpen()) {
                 this._oPopover.close();
             }
         },
 
-        _setListsVisible: function (bVisible, oList) {
-            oList.setVisible(bVisible);
-            if (this._oSearchHistoryList.getVisible() === true) {
-                if (this._oFrequentlyUsedAppsList.getVisible() === true || this._oProductsList.getVisible() === true) {
-                    this._oSearchHistoryList.addStyleClass("sapUshellCEPListDivider");
-                }
-            }
-            if (this._oFrequentlyUsedAppsList.getVisible() === true) {
-                if (this._oProductsList.getVisible() === true) {
-                    this._oFrequentlyUsedAppsList.addStyleClass("sapUshellCEPListDivider");
-                }
-            }
-            if (this._oSearchResultList.getVisible() === true) {
-                if (this._oExternalSearchResultList.getVisible() === true) {
-                    this._oSearchResultList.addStyleClass("sapUshellCEPListDivider");
-                }
-            }
-        },
+        _navigateToApp: function (oResult, sSearchTerm) {
 
-        _navigateURL: function (sUrl) {
-            WindowUtils.openURL(sUrl);
-            this.oSF.setValue("");
-            setTimeout(function () {
-                if (this._oPopover.isOpen()) {
-                    this._oPopover.close();
-                }
-            }.bind(this), 500);
-        },
-
-        _navigateApp: function (sSemanticObject, sAction) {
-            var oParams = {};
-            sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
-                oCrossAppNavService.toExternal({
-                    target: {
-                        semanticObject: sSemanticObject,
-                        action: sAction
-                    },
-                    params: oParams
-                });
+            this._SearchCEPService.then(function (oSearchCEPService) {
+                oSearchCEPService.navigate(oResult, sSearchTerm);
             });
+
             if (this.oSF.getValue() !== "") {
                 this.oSF.setValue("");
             }
+
             setTimeout(function () {
                 if (this._oPopover.isOpen()) {
                     this._oPopover.close();
@@ -834,34 +867,29 @@ sap.ui.define([
         },
 
         _navigateToResultPage: function (sTerm, bAll) {
-            var sHash;
             if (sTerm === "") {
                 return;
             }
+            var sHash = "#WorkZoneSearchResult-display?searchTerm=" + sTerm + "&category=app";
             if (bAll === true) {
                 sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"All\",\"label\":\"All\",\"labelPlural\":\"All\"},\"searchTerm\":\"" +
                     sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
-            } else if (this.bNavigateToNewResultPage === true) {
-                sHash = "#WorkZoneSearchResult-display?searchTerm=" + sTerm + "&category=app";
-            } else {
-                sHash = "#Action-search&/top=20&filter={\"dataSource\":{\"type\":\"Category\",\"id\":\"$$APPS$$\",\"label\":\"Apps\",\"labelPlural\":\"Apps\"},\"searchTerm\":\"" +
-                    sTerm + "\",\"rootCondition\":{\"type\":\"Complex\",\"operator\":\"And\",\"conditions\":[]}}";
             }
             this.bOnNavigationToResultPage = true;
-            sap.ushell.Container.getServiceAsync("CrossApplicationNavigation").then(function (oCrossAppNavService) {
+            var pNavServicePromise = sap.ushell.Container.getServiceAsync("CrossApplicationNavigation");
+            pNavServicePromise.then(function (oCrossAppNavService) {
                 oCrossAppNavService.toExternal({
                     target: {
                         shellHash: sHash
                     }
                 });
             });
-            if (this.bNavigateToNewResultPage === true) {
-                setTimeout(function () {
-                    if (this._oPopover.isOpen()) {
-                        this._oPopover.close();
-                    }
-                }.bind(this), 500);
+            setTimeout(function () {
+                if (this._oPopover.isOpen()) {
+                    this._oPopover.close();
                 }
+            }.bind(this), 500);
+
             setTimeout(function () {
                 this.bOnNavigationToResultPage = false;
             }.bind(this), 3000);