@sapui5/sap.ushell 1.118.0 → 1.119.2

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

@@ -5,6 +5,7 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/ui/core/Fragment",
     "sap/m/List",
+    "sap/m/Text",
     "sap/m/StandardListItem",
     "sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider",
     "sap/base/Log",
@@ -15,12 +16,14 @@ sap.ui.define([
     "sap/ui/core/Configuration",
     "sap/base/util/UriParameters",
     "sap/ui/core/Core",
-    "sap/ushell/EventHub"
+    "sap/ushell/EventHub",
+    "sap/m/Avatar"
 ], function (
     Controller,
     JSONModel,
     Fragment,
     List,
+    Text,
     StandardListItem,
     SearchProvider,
     Log,
@@ -31,7 +34,8 @@ sap.ui.define([
     Configuration,
     UriParameters,
     Core,
-    EventHub
+    EventHub,
+    Avatar
 ) {
     "use strict";
 
@@ -175,7 +179,14 @@ sap.ui.define([
             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"));
+            document.getElementById("CEPSearchField-search").title = resources.i18n.getText("search");
+            // add tooltip to truncated list items
+            var aListItemsTitles = document.querySelectorAll(".searchCEPList .sapMSLIDiv:not(.sapMGrowingListTriggerText)>.sapMSLITitleOnly");
+            aListItemsTitles.forEach(function (oDiv) {
+                if (oDiv.scrollWidth > oDiv.offsetWidth) {
+                    oDiv.parentNode.parentNode.title = oDiv.innerText;
+                }
+            });
         },
 
         onAfterClose: function (oEvent) {
@@ -423,20 +434,15 @@ sap.ui.define([
                 id: oConfiguration.id,
                 showSeparators: "None",
                 headerText: oConfiguration.titleVisible ? oConfiguration.title : "",
+                headerLevel: "H1",
                 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")
+                    factory: this._createListItem.bind(this)
                 },
-
                 growingStarted: this._listUpdateStart.bind(this),
                 updateStarted: this._listUpdateStart.bind(this),
                 itemPress: this._itemPress.bind(this)
@@ -462,6 +468,37 @@ sap.ui.define([
             return oList;
         },
 
+        _createListItem: function (sId, oContext) {
+
+            var oParams = {
+                    type: "Active",
+                    title: oContext.getProperty("text"),
+                    iconDensityAware: false
+                },
+                sIconPath = oContext.getProperty("icon");
+
+            var oAvatar = new Avatar("", {
+                displaySize: "XS",
+                backgroundColor: "Transparent",
+                displayShape: "Square",
+                src: sIconPath,
+                imageFitType: "Contain",
+                decorative: true
+            });
+
+            oParams.avatar = oAvatar;
+
+            if (sIconPath.indexOf("sap-icon://") > -1) {
+                // override with generic icon color
+                oAvatar.addStyleClass("searchCEPlistItemIcon");
+            }
+
+            var oListItem = new StandardListItem(oParams);
+            oListItem.addStyleClass("sapUiTinyMarginBeginEnd");
+
+            return oListItem;
+        },
+
         _itemPress: function (oEvent) {
 
             var fnHandleItemPress,
@@ -489,6 +526,12 @@ sap.ui.define([
                     fnHandleItemPress = oModelListItem.press;
                     fnHandleItemPress(oEvent);
                 }
+
+                // handle close popover logic
+                if ((!oModelListItem.hasOwnProperty("closePopover") && oListConfig.closePopover === true)
+                    || (oModelListItem.hasOwnProperty("closePopover") && oModelListItem.closePopover === true)) {
+                    this._oPopover.close();
+                }
             }
         },
 
@@ -645,18 +688,23 @@ sap.ui.define([
 
         _applyResultsAcc: function (iNumOfItems) {
 
-            var sAriaText = "";
+            var sNewAriaText = "",
+                oDescriptionSpan = this.oSF.$("SuggDescr"),
+                sOldAriaText = oDescriptionSpan.text();
 
             // add items to list
             if (iNumOfItems === 1) {
-                sAriaText = resources.i18n.getText("one_result_search_aria", iNumOfItems);
+                sNewAriaText = resources.i18n.getText("one_result_search_aria", iNumOfItems);
             } else if (iNumOfItems > 1) {
-                sAriaText = resources.i18n.getText("multiple_results_search_aria", iNumOfItems);
+                sNewAriaText = resources.i18n.getText("multiple_results_search_aria", iNumOfItems);
             } else {
-                sAriaText = resources.i18n.getText("no_results_search_aria");
+                sNewAriaText = resources.i18n.getText("no_results_search_aria");
             }
-            // update Accessibility text for suggestion
-            this.oSF.$("SuggDescr").text(sAriaText);
+            // update Accessibility text to announce current number of search results
+            if (sOldAriaText.indexOf(".") < 0) {
+                sNewAriaText += ".";
+            }
+            oDescriptionSpan.text(sNewAriaText);
         },
 
         _toggleSearchPopover: function (bOpen) {
@@ -685,6 +733,15 @@ sap.ui.define([
                     }
 
                     this._initializeSearchField();
+
+                    var oText = new Text({
+                            id: "popoverTitle",
+                            text: "List of search results and navigation suggestions"
+                        });
+
+                        oText.addStyleClass("sapUiInvisibleText");
+                        this._oPopover.addContent(oText);
+
                     this._initLists().then(function () {
                         this._testProviders();
                     }.bind(this));
@@ -692,6 +749,7 @@ sap.ui.define([
             } else if (bOpen) {
                 this._oPopover.openBy(this._oPlaceHolderSF);
                 this.bOpeningPopOver = true;
+
                 if (this._oPlaceHolderSF.getValue() !== "") {
                     this.oSF.setValue(this._oPlaceHolderSF.getValue());
                 }

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchFieldFragment.fragment.xml

@@ -13,7 +13,8 @@
         beforeOpen=".onBeforeOpen"
         afterOpen=".onAfterOpen"
         afterClose=".onAfterClose"
-        horizontalScrolling="false">
+        horizontalScrolling="false"
+        ariaLabelledBy="popoverTitle">
         <content>
             <SearchField
                 id="CEPSearchField"

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/FrequentActivityProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/base/Log"
@@ -10,7 +10,6 @@ sap.ui.define([
     "use strict";
 
     /**
-     * @constructor
      * @class
      * @since 1.101.0
      * @private

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/RecentSearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/base/Log"
@@ -10,7 +10,6 @@ sap.ui.define([
     "use strict";
 
     /**
-     * @constructor
      * @class
      * @since 1.101.0
      * @private

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module is the search provider main interface
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/ushell/resources",

package/src/main/js/sap/ushell/components/shell/SearchCEP/SearchProviders/SearchServiceProvider.js

@@ -2,7 +2,7 @@
 
 /**
  * @fileOverview This module handles the navigation service search actions
- * @version 1.118.0
+ * @version 1.119.2
  */
 sap.ui.define([
     "sap/base/Log",
@@ -18,7 +18,6 @@ sap.ui.define([
     "use strict";
 
     /**
-     * @constructor
      * @class
      * @since 1.101.0
      * @private

package/src/main/js/sap/ushell/components/shell/Settings/Component.js

@@ -48,7 +48,7 @@ sap.ui.define([
     return UIComponent.extend("sap.ushell.components.shell.Settings.Component", {
 
         metadata: {
-            version: "1.118.0",
+            version: "1.119.2",
             library: "sap.ushell",
             dependencies: {
                 libs: {

package/src/main/js/sap/ushell/components/shell/Settings/ErrorMessageHelper.js

@@ -1,11 +1,10 @@
 // Copyright (c) 2009-2023 SAP SE, All Rights Reserved
 
 sap.ui.define([
-    "sap/ui/core/Core"
-], function (Core) {
+    "sap/ui/core/Messaging"
+], function (Messaging) {
     "use strict";
     var sUserSettingsErrorDialogTarget = "sapUshellSettingsDialog/";
-    var oMessageManager = Core.getMessageManager();
 
     return {
         addMessage: addMessage,
@@ -21,7 +20,7 @@ sap.ui.define([
      */
     function addMessage (message) {
         message.setTargets([sUserSettingsErrorDialogTarget]);
-        oMessageManager.addMessages(message);
+        Messaging.addMessages(message);
     }
 
     /**
@@ -31,8 +30,8 @@ sap.ui.define([
      * @private
      */
     function filterMessagesToDisplay () {
-        return oMessageManager.getMessageModel().getData().filter(function (oMessage) {
-            return oMessage.getTarget() && oMessage.getTarget().indexOf(sUserSettingsErrorDialogTarget) === 0;
+        return Messaging.getMessageModel().getData().filter(function (oMessage) {
+            return oMessage.getTargets() && oMessage.getTargets().indexOf(sUserSettingsErrorDialogTarget) === 0;
         });
     }
 
@@ -42,9 +41,9 @@ sap.ui.define([
      * @private
      */
     function removeErrorMessages () {
-        oMessageManager.getMessageModel().getData().forEach(function (oMessage) {
-            if (oMessage.getTarget() && oMessage.getTarget().indexOf(sUserSettingsErrorDialogTarget) === 0) {
-                oMessageManager.removeMessages(oMessage);
+        Messaging.getMessageModel().getData().forEach(function (oMessage) {
+            if (oMessage.getTargets() && oMessage.getTargets().indexOf(sUserSettingsErrorDialogTarget) === 0) {
+                Messaging.removeMessages(oMessage);
             }
         });
     }

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.controller.js

@@ -66,6 +66,7 @@ sap.ui.define([
 
             Device.orientation.attachHandler(this._fnOrientationChange, this);
 
+            this._oSelectedItemOnMobile = null; // used to enable selection on mobile
             this._oConfigDoable = Config
                 .on("/core/userPreferences/entries")
                 .do(this._processNewEntries.bind(this));
@@ -250,7 +251,7 @@ sap.ui.define([
          * Tries to load the information for the list item of an entry async.
          *
          * @param {string} sEntryId the id on an entry
-         * @returns {Promise<void>} Resolves the entry value was fetched and set
+         * @returns {Promise<undefined>} Resolves the entry value was fetched and set
          *
          * @private
          */
@@ -336,8 +337,8 @@ sap.ui.define([
          * @private
          */
         _navToggleButtonPressHandler: function () {
-            var oSplitApp = this.getView().byId("settingsApp"),
-                bIsMasterShown = oSplitApp.isMasterShown();
+            var oSplitApp = this.getView().byId("settingsApp");
+            var bIsMasterShown = oSplitApp.isMasterShown();
 
             if (bIsMasterShown) {
                 oSplitApp.hideMaster();
@@ -384,7 +385,7 @@ sap.ui.define([
          * Navigates to the detail page that belongs to the given selected item.
          *
          * @param {sap.m.StandardListItem} oSelectedItem the StandardListItem that should be handled.
-         * @returns {Promise<void>} A promise which resolves when the navigation was done.
+         * @returns {Promise<undefined>} A promise which resolves when the navigation was done.
          * @private
          */
         _toDetail: function (oSelectedItem) {
@@ -392,6 +393,7 @@ sap.ui.define([
             var oModel = oView.getModel();
             var oResultsModel = oView.getModel("results");
 
+            var oSplitApp = oView.byId("settingsApp");
             var sEntryPath = oSelectedItem.getBindingContextPath();
             var oEntry = oModel.getProperty(sEntryPath);
             var sEntryId = oEntry.id;
@@ -405,17 +407,19 @@ sap.ui.define([
                 this._aPreviouslySelectedItems = [sEntryId];
             }
 
-            // Clear selection from list.
-            if (Device.system.phone) {
+            if (Device.system.phone) { // Clear selection from list on mobile.
+                this._oSelectedItemOnMobile = oSelectedItem;
                 oSelectedItem.setSelected(false);
             }
 
+            // Entry result was already saved
             if (sDetailPageId) {
                 this._navToDetail(sDetailPageId, oView);
                 var sWrapperId = oEntry.tabs.map(function (oTabEntry) {
                     return oTabEntry.id;
                 }).join("-");
                 var oWrapperPromise = this._mLoadedWrappers.get(sWrapperId);
+                // Loading of actual wrapper+entry was started
                 if (oWrapperPromise) {
                     oWrapperPromise.then(function (oWrapper) {
                         var oIconTabBar = oWrapper.getContent()[1];
@@ -436,24 +440,48 @@ sap.ui.define([
                     return Promise.resolve();
                 }
             }
+            // First time entry was required => load wrapper+entry
+
+            // Show busy content as long as the selected Page is not yet loaded.
+            if (Device.system.phone) {
+                // the busy page interacts with the back navigation on mobile
+                oSplitApp.setBusy(true);
+            } else {
+                this._navToBusyPage();
+            }
 
             return Promise.all([
                 this._createContentWrapper(oEntry),
                 this._createEntryContent(oEntry)
             ]).then(function (aResults) {
+                var oWrapper = aResults[0];
+                var oEntryContent = aResults[1];
+
                 var aEntries = Config.last("/core/userPreferences/entries");
                 var bEntryAvailable = aEntries.some(function (oEntry) {
                     return oEntry.id === sEntryId && oEntry.visible !== false;
                 });
+
+                var oMasterEntryList = oView.byId("userSettingEntryList");
+                var oCurrentSelectedItem = oMasterEntryList.getSelectedItem() || this._oSelectedItemOnMobile;
+                // Since the entry content creation is delayed, it might be that the user already selected a different settings entry.
+                var bLoadedDetailMatchesSelectedEntry = oSelectedItem === oCurrentSelectedItem;
+
                 if (!bEntryAvailable) {
+                    if (bLoadedDetailMatchesSelectedEntry) {
+                        if (oSplitApp.getMode() === "ShowHideMode") {
+                                oSplitApp.showMaster();
+                                this._updateHeaderButtonVisibility(true);
+                        } else {
+                            this._toDetail(oCurrentSelectedItem || oMasterEntryList.getItems()[0]);
+                        }
+                    }
+
                     // don't add entries which are not visible anymore
                     return;
                 }
 
-                var oWrapper = aResults[0];
-                var oEntryContent = aResults[1];
-
-                this.getView().byId("settingsApp").addDetailPage(oWrapper);
+                oSplitApp.addDetailPage(oWrapper);
 
                 if (oEntry.tabs.length > 1) {
                     oWrapper.getContent()[1].getItems()[0].addContent(oEntryContent);
@@ -464,8 +492,11 @@ sap.ui.define([
                 var sNewDetailPageId = oWrapper.getId();
                 oResultsModel.setProperty("/entries/" + sEntryId + "/contentResult", sNewDetailPageId);
 
-                this._navToDetail(sNewDetailPageId, oView);
-                this._emitEntryOpened(sEntryId);
+
+                if (bLoadedDetailMatchesSelectedEntry) {
+                    this._navToDetail(sNewDetailPageId, oView);
+                    this._emitEntryOpened(sEntryId);
+                }
 
                 return oWrapper.getId();
             }.bind(this));
@@ -576,6 +607,14 @@ sap.ui.define([
             });
         },
 
+        /**
+         * Navigates to busy page
+         */
+        _navToBusyPage: function () {
+            var oView = this.getView();
+            this._navToDetail(oView.createId("userSettingBusyPage"), oView);
+        },
+
         /**
          * Navigates to the corresponding detail Page.
          *
@@ -585,6 +624,7 @@ sap.ui.define([
          */
         _navToDetail: function (sId, oView) {
             var oSplitApp = oView.byId("settingsApp");
+            oSplitApp.setBusy(false);
 
             oSplitApp.toDetail(sId);
             if (oSplitApp.getMode() === "ShowHideMode") {
@@ -790,7 +830,7 @@ sap.ui.define([
                     ErrorMessageHelper.addMessage(errorInformation);
                     return;
                 } else {
-                    sMessage = resources.i18n.getText("userSettings.SavingError.WithMessage", errorInformation.message);
+                    sMessage = resources.i18n.getText("userSettings.SavingError.WithMessage", [errorInformation.message]);
                 }
 
                 ErrorMessageHelper.addMessage(new Message({

package/src/main/js/sap/ushell/components/shell/Settings/UserSettings.view.xml

@@ -70,6 +70,11 @@
                                 </content>
                             </Page>
                         </masterPages>
+                        <detailPages>
+                            <Page id="userSettingBusyPage"
+                                showHeader="false"
+                                busy="true" />
+                        </detailPages>
                     </SplitApp>
                 </content>
                 <footer>

package/src/main/js/sap/ushell/components/shell/Settings/appearance/Appearance.controller.js

@@ -8,7 +8,6 @@ sap.ui.define([
     "sap/ui/core/library",
     "sap/ui/core/message/Message",
     "sap/ui/core/mvc/Controller",
-    "sap/ui/core/theming/Parameters",
     "sap/ui/Device",
     "sap/ui/model/json/JSONModel",
     "sap/ui/thirdparty/jquery",
@@ -16,7 +15,8 @@ sap.ui.define([
     "sap/ushell/EventHub",
     "sap/ushell/resources",
     "sap/ushell/services/DarkModeSupport",
-    "sap/ushell/User"
+    "sap/ushell/User",
+    "sap/ushell/utils"
 ], function (
     Log,
     BaseObject,
@@ -25,7 +25,6 @@ sap.ui.define([
     coreLibrary,
     Message,
     Controller,
-    Parameters,
     Device,
     JSONModel,
     jQuery,
@@ -33,7 +32,8 @@ sap.ui.define([
     EventHub,
     ushellResources,
     DarkModeSupport,
-    User
+    User,
+    ushellUtils
 ) {
     "use strict";
 
@@ -104,18 +104,20 @@ sap.ui.define([
             // listener
             Core.attachThemeChanged(this._handleThemeApplied, this);
 
-            return this.getDarkModeModel(this.aThemeListFromServer)
-                .then(function (oDarkModeModel) {
-                    this._oDarkModeModel = oDarkModeModel;
-                    oView.setModel(this._oDarkModeModel, "darkMode");
-
-                    // Model for the tab with theme list
-                    var oUserTheme = this.oUser.getTheme();
-                    oView.setModel(new JSONModel({
-                        options: this._getThemeListData(this.aThemeListFromServer, oUserTheme),
-                        ariaTexts: { headerLabel: ushellResources.i18n.getText("Appearance") }
-                    }));
-                }.bind(this));
+            this._oDarkModeModel = this.getDarkModeModel(this.aThemeListFromServer);
+            oView.setModel(this._oDarkModeModel, "darkMode");
+
+            // Model for the tab with theme list
+            var oUserTheme = this.oUser.getTheme();
+            oView.setModel(new JSONModel({
+                options: this._getThemeListData(this.aThemeListFromServer, oUserTheme),
+                ariaTexts: { headerLabel: ushellResources.i18n.getText("Appearance") }
+            }));
+
+            return Promise.all([
+                this._oConfigModelPromise,
+                this._oDarkModeModelPromise
+            ]);
         },
 
         onExit: function () {
@@ -180,13 +182,13 @@ sap.ui.define([
         },
 
         getConfigurationModel: function () {
-            return new JSONModel({
+            const oConfigModel = new JSONModel({
                 themeConfigurable: Config.last("/core/shell/model/setTheme"),
                 sizeBehaviorConfigurable: Config.last("/core/home/sizeBehaviorConfigurable"),
                 tileSize: this.TILE_SIZE[Config.last("/core/home/sizeBehavior")],
                 contentDensityConfigurable: Config.last("/core/shell/model/contentDensity") && !Device.system.phone,
                 isCozyContentMode: document.body.classList.contains("sapUiSizeCozy"),
-                sapUiContentIconColor: Parameters.get("sapUiContentIconColor"),
+                sapUiContentIconColor: "",
                 textAlign: Device.system.phone ? "Left" : "Right",
                 showContentProviderInfoOnVisualizationsConfigurable:
                     Config.last("/core/contentProviders/providerInfo/enabled") &&
@@ -194,36 +196,36 @@ sap.ui.define([
                 showContentProviderInfoOnVisualizationsSelected:
                     Config.last("/core/contentProviders/providerInfo/showContentProviderInfoOnVisualizations")
             });
+
+            this._oConfigModelPromise = ushellUtils.getThemingParameters(["sapUiContentIconColor"]).then(([sSapUiContentIconColor]) => {
+                oConfigModel.setProperty("/sapUiContentIconColor", sSapUiContentIconColor);
+            });
+
+            return oConfigModel;
         },
 
         getDarkModeModel: function (aThemeList) {
-            var oDarkModeModel = new JSONModel({});
-            var oDarkModeModelData = {
+            var oDarkModeModel = new JSONModel({
                 enabled: false,
                 detectionSupported: false,
                 detectionEnabled: false,
                 supportedThemes: {}
-            };
-            var oPromise;
+            });
 
             if (Config.last("/core/darkMode/enabled")) {
-                oPromise = sap.ushell.Container.getServiceAsync("DarkModeSupport")
-                    .then(function (oDarkModeSupport) {
-                        oDarkModeModelData.enabled = true;
-                        oDarkModeModelData.detectionSupported = oDarkModeSupport.canAutomaticallyToggleDarkMode();
-                        // if detection is not supported, e.g. due to the "&sap-theme=" URL parameter,
-                        // then do not enable dark mode detection disregarding the user setting.
-                        oDarkModeModelData.detectionEnabled = oDarkModeModelData.detectionSupported && this.oUser.getDetectDarkMode();
-                        oDarkModeModelData.supportedThemes = this._getSupportedDarkModeThemes(aThemeList, Config.last("/core/darkMode/supportedThemes") || []);
-                        oDarkModeModel.setData(oDarkModeModelData);
-                        return oDarkModeModel;
-                    }.bind(this));
+                this._oDarkModeModelPromise = sap.ushell.Container.getServiceAsync("DarkModeSupport").then(function (oDarkModeSupport) {
+                    oDarkModeModel.setProperty("/enabled", true);
+                    oDarkModeModel.setProperty("/detectionSupported", oDarkModeSupport.canAutomaticallyToggleDarkMode());
+                    // if detection is not supported, e.g. due to the "&sap-theme=" URL parameter,
+                    // then do not enable dark mode detection disregarding the user setting.
+                    oDarkModeModel.setProperty("/detectionEnabled", oDarkModeSupport.canAutomaticallyToggleDarkMode() && this.oUser.getDetectDarkMode());
+                    oDarkModeModel.setProperty("/supportedThemes", this._getSupportedDarkModeThemes(aThemeList, Config.last("/core/darkMode/supportedThemes") || []));
+                }.bind(this));
             } else {
-                oDarkModeModel.setData(oDarkModeModelData);
-                oPromise = Promise.resolve(oDarkModeModel);
+                this._oDarkModeModelPromise = Promise.resolve();
             }
 
-            return oPromise;
+            return oDarkModeModel;
         },
 
         _getSupportedDarkModeThemes: function (aThemeList, aSupportedThemePairs) {
@@ -274,10 +276,11 @@ sap.ui.define([
             });
         },
 
-        _handleThemeApplied: function () {
+        _handleThemeApplied: async function () {
             var oConfigModel = this.getView().getModel("config");
             if (oConfigModel) {
-                oConfigModel.setProperty("/sapUiContentIconColor", Parameters.get("sapUiContentIconColor"));
+                const [sSapUiContentIconColor] = await ushellUtils.getThemingParameters(["sapUiContentIconColor"]);
+                oConfigModel.setProperty("/sapUiContentIconColor", sSapUiContentIconColor);
                 // readjusts the theme list after the dark mode change
                 var oUserTheme = this.oUser.getTheme();
                 var aThemeListData = this._getThemeListData(this.aThemeListFromServer, oUserTheme);

package/src/main/js/sap/ushell/components/shell/Settings/notifications/NotificationsSetting.controller.js

@@ -89,7 +89,7 @@ sap.ui.define([
         /**
          * Called when the "Save" button is pressed. Saves the current settings in case they have changed.
          *
-         * @returns {Promise<void>} A promise that resolves when the settings have changed successfully or when there were no changes made.
+         * @returns {Promise<undefined>} A promise that resolves when the settings have changed successfully or when there were no changes made.
          * @private
          */
         onSave: function () {

package/src/main/js/sap/ushell/components/shell/Settings/userActivities/UserActivitiesSetting.controller.js

@@ -42,7 +42,7 @@ sap.ui.define([
         /**
          * Called when the "Save" button is pressed. Saves the current settings in case they have changed.
          *
-         * @returns {Promise<void>} A promise that resolves when the settings have changed successfully or when there were no changes made.
+         * @returns {Promise<undefined>} A promise that resolves when the settings have changed successfully or when there were no changes made.
          * @private
          */
         onSave: function () {
@@ -56,7 +56,7 @@ sap.ui.define([
          * Enables or disables the tracking of user activities in the ushell.
          *
          * @param {boolean} enabled Whether to activate or de-activate it.
-         * @returns {Promise<void>} A promise that resolves when the settings were changed succesfully.
+         * @returns {Promise<undefined>} A promise that resolves when the settings were changed succesfully.
          * @private
          */
         _setTrackingToEnabled: function (enabled) {