@sapui5/sap.ushell 1.113.0 → 1.115.0

package/src/main/js/sap/ushell/renderers/fiori2/resources/resources_zh_CN.properties

@@ -740,7 +740,6 @@ userAccountResetPersonalizationWarningDialogSuccessToast=\u8BBE\u7F6E\u5DF2\u621
 userAccountResetPersonalizationWarningDialogErrorDialog=\u65E0\u6CD5\u91CD\u7F6E\u4E2A\u6027\u5316\u8BBE\u7F6E\u6570\u636E\u3002\n\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002
 AppearanceContentDensityLabel=\u5DF2\u9488\u5BF9\u89E6\u6478\u8F93\u5165\u8FDB\u884C\u4F18\u5316
 AnchorBarLabel=\u4E3B\u9875\u663E\u793A
-AppearanceContentDensityTooltip=\u7981\u7528\u4EE5\u51CF\u5C0F\u63A7\u4EF6\u7684\u95F4\u8DDD
 AppearanceThemeMenu=\u4E3B\u9898
 AppearanceLayoutAndBehaviorMenu=\u663E\u793A\u8BBE\u7F6E
 
@@ -797,8 +796,8 @@ DontDisplayImg=\u4E0D\u663E\u793A\u56FE\u50CF
 ShellNavigationMenu_AriaLabel={0} - \u663E\u793A\u5BFC\u822A\u83DC\u5355
 ShowAllMyApps_AriaLabel={0} - \u663E\u793A\u6211\u7684\u6240\u6709\u5E94\u7528
 AnchorNavigationBar_AriaLabel=\u7EC4\u5BFC\u822A
-SecondaryContent_AriaLabel=\u6B21\u8981\u5185\u5BB9
-ShellLayout.AriaLabel=\u5916\u58F3\u5185\u5BB9
+SidePane_AriaLabel=\u6B21\u8981\u5185\u5BB9
+ShellContent.AriaLabel=\u5916\u58F3\u5185\u5BB9
 ToolArea_AriaLabel=\u5DE5\u5177\u533A\u57DF
 FloatingContainer_AriaLabel=\u6D6E\u52A8\u5BB9\u5668
 ShellNavigationMenu_HierarchyItemsAriaLabel=\u5206\u5C42\u5BFC\u822A
@@ -817,9 +816,10 @@ AppearanceTileSizeSmall=\u5C0F
 AppearanceTileSizeLarge=\u5927
 appearanceTileSizeDescriptionText=\u4E3A\u53F0\u5F0F\u8BBE\u5907\u8BBE\u7F6E\u4E3B\u9875\u4E0A\u78C1\u8D34\u7684\u5927\u5C0F\u3002\u79FB\u52A8\u8BBE\u5907\u4E0A\u7684\u78C1\u8D34\u5927\u5C0F\u59CB\u7EC8\u4E3A\u5C0F\uFF0C\u4E0D\u53D7\u6B64\u8BBE\u7F6E\u5F71\u54CD\u3002
 appearanceCompactCozyDescriptionText=\u589E\u52A0\u63A7\u4EF6\u7684\u5927\u5C0F\u548C\u95F4\u8DDD\uFF0C\u4ECE\u800C\u66F4\u6613\u4E8E\u4F7F\u7528\u6307\u5C16\u4E0E\u5176\u8FDB\u884C\u4EA4\u4E92\u3002 \u5BF9\u4E8E\u517C\u6709\u89E6\u6478\u548C\u9F20\u6807\u4E8B\u4EF6\u7684\u6DF7\u5408\u8BBE\u5907\uFF0C\u8FD9\u4E00\u70B9\u5F88\u6709\u7528\u3002
+AppearanceShowContentProviderInfoOnVisualizationsLabel=\u5728\u78C1\u8D34\u4E0A\u663E\u793A\u6E90\u7CFB\u7EDF\u540D\u79F0
+AppearanceShowContentProviderInfoOnVisualizationsText=\u76F4\u63A5\u5728\u78C1\u8D34\u4E0A\u663E\u793A\u5E94\u7528\u7A0B\u5E8F\u6765\u81EA\u54EA\u4E2A\u7CFB\u7EDF\u3002\u5982\u679C\u6240\u4F7F\u7528\u7684\u5E94\u7528\u7A0B\u5E8F\u5728\u591A\u4E2A\u7CFB\u7EDF\u4E2D\u53EF\u7528\uFF0C\u5EFA\u8BAE\u6FC0\u6D3B\u6B64\u8BBE\u7F6E\u3002
 AppearanceDarkModeLabel=\u81EA\u52A8\u6DF1\u8272\u6A21\u5F0F\u68C0\u6D4B
-AppearanceDarkModeDetectionTooltip=\u542F\u7528\u81EA\u52A8\u6DF1\u8272\u6A21\u5F0F\u68C0\u6D4B
-appearanceDarkModeDetectionText=\u6839\u636E\u64CD\u4F5C\u7CFB\u7EDF\u8BBE\u7F6E\u5BF9\u517C\u5BB9\u4E3B\u9898\u542F\u7528\u81EA\u52A8\u6DF1\u8272\u6A21\u5F0F\u68C0\u6D4B\u3002
+AppearanceDarkModeDetectionText=\u6839\u636E\u64CD\u4F5C\u7CFB\u7EDF\u8BBE\u7F6E\u5BF9\u517C\u5BB9\u4E3B\u9898\u542F\u7528\u81EA\u52A8\u6DF1\u8272\u6A21\u5F0F\u68C0\u6D4B\u3002
 AppearanceHighContrastTheme={0} \u9AD8\u5BF9\u6BD4\u5EA6
 LanguageAndRegionHelpingText=\u4FDD\u5B58\u8BBE\u7F6E\u540E\uFF0C\u6D4F\u89C8\u5668\u5C06\u4F1A\u5237\u65B0\u4EE5\u4F7F\u65B0\u8BBE\u7F6E\u751F\u6548\u3002
 TimeZoneHelpingText=\u5C06\u4E0D\u4F1A\u5728 UI5 \u5E94\u7528\u7A0B\u5E8F\u4E2D\u5E94\u7528\u65F6\u533A\u3002\n\u5982\u679C\u4E0D\u77E5\u9053\u5E94\u7528\u7A0B\u5E8F\u7684\u7C7B\u578B\uFF0C\u53EF\u5728\u201C\u5173\u4E8E\u201D\u5BF9\u8BDD\u6846\u4E2D\u68C0\u67E5\u201C\u5E94\u7528\u7A0B\u5E8F\u6846\u67B6\u7684\u6807\u8BC6\u201D\u5B57\u6BB5\u3002
@@ -966,17 +966,15 @@ MyHome.InitialPage.Message.HidePage=\u662F\u5426\u8981\u9690\u85CF\u6B64\u9875\u
 MyHome.InitialPage.Message.GoToUserSettings=\u8F6C\u5230\u7528\u6237\u8BBE\u7F6E\u3002
 MyHome.InitialPage.Message.ImportSuccessful=\u5BFC\u5165\u6210\u529F
 
-ContentFinder.AppBox.Button.Tooltip.LaunchApplication=\u542F\u52A8\u5E94\u7528\u7A0B\u5E8F
-ContentFinder.AppBox.Label.Type=\u7C7B\u578B\uFF1A
-ContentFinder.AppBox.Label.Information=\u4FE1\u606F\uFF1A
-ContentFinder.AppBox.Label.FioriId=SAP Fiori \u6807\u8BC6\uFF1A
-ContentFinder.AppBox.Label.SystemId=\u7CFB\u7EDF\u6807\u8BC6\uFF1A
-ContentFinder.AppBox.Label.Preview=\u9884\u89C8\uFF1A
-ContentFinder.AppBox.Text.FieldEmpty=\u4E0D\u53EF\u7528
-ContentFinder.AppBox.Button.Preview=\u9884\u89C8
-ContentFinder.AppBox.Button.Close=\u5173\u95ED
-ContentFinder.Categories.Applications.Title=\u5E94\u7528\u7A0B\u5E8F
-ContentFinder.Widgets.Tiles.Title=\u78C1\u8D34
-ContentFinder.Widgets.Tiles.Description=\u5E94\u7528\u7A0B\u5E8F\u7684\u53EF\u89C6\u8868\u793A\u3002
-ContentFinder.Widgets.Cards.Title=\u5361
-ContentFinder.Widgets.Cards.Description=\u5E94\u7528\u7A0B\u5E8F\u7684\u53EF\u89C6\u8868\u793A\uFF0C\u4EE5\u7075\u6D3B\u5E03\u5C40\u663E\u793A\u3002
+
+NavigationBarMenu.PinnedSpaces.Title=\u5DF2\u56FA\u5B9A\u7A7A\u95F4 ({0})
+NavigationBarMenu.AllSpaces.Title=\u6240\u6709\u7A7A\u95F4
+NavigationBarMenu.Button.PinSpace=\u56FA\u5B9A\u7A7A\u95F4
+NavigationBarMenu.Button.UnpinSpace=\u53D6\u6D88\u56FA\u5B9A\u7A7A\u95F4
+NavigationBarMenu.Button.UnpinAll=\u5168\u90E8\u53D6\u6D88\u56FA\u5B9A
+NavigationBarMenu.Button.UnpinAll.Tooltip=\u53D6\u6D88\u56FA\u5B9A\u6240\u6709\u7A7A\u95F4
+NavigationBarMenu.PinnedSpaces.NoDataText=\u5C06\u6240\u6536\u85CF\u7684\u7A7A\u95F4\u56FA\u5B9A\u5230\u5BFC\u822A\u680F\u3002
+NavigationBarMenu.AllSpaces.NoDataText=\u6CA1\u6709\u7ED9\u60A8\u5206\u914D\u4EFB\u4F55\u7A7A\u95F4\u3002
+NavigationBarMenu.Button.OpenPopover=\u4E2A\u6027\u5316\u8BBE\u7F6E\u5BFC\u822A\u680F
+
+SysInfoBarAriaLabel=\u7CFB\u7EDF\u4FE1\u606F\u680F - {0} {1}

package/src/main/js/sap/ushell/renderers/fiori2/resources/resources_zh_TW.properties

@@ -740,7 +740,6 @@ userAccountResetPersonalizationWarningDialogSuccessToast=\u8A2D\u5B9A\u503C\u5DF
 userAccountResetPersonalizationWarningDialogErrorDialog=\u7121\u6CD5\u91CD\u8A2D\u60A8\u7684\u500B\u4EBA\u5316\u8CC7\u6599\u3002\n\u8ACB\u7A0D\u5F8C\u518D\u8A66\u4E00\u6B21\u3002
 AppearanceContentDensityLabel=Touch Input \u6700\u4F73\u5316
 AnchorBarLabel=\u9996\u9801\u986F\u793A
-AppearanceContentDensityTooltip=\u505C\u7528\u4EE5\u6E1B\u5C11\u63A7\u5236\u9805\u4E4B\u9593\u7684\u9593\u8DDD
 AppearanceThemeMenu=\u4E3B\u984C
 AppearanceLayoutAndBehaviorMenu=\u986F\u793A\u8A2D\u5B9A
 
@@ -797,8 +796,8 @@ DontDisplayImg=\u4E0D\u8981\u986F\u793A\u5716\u50CF
 ShellNavigationMenu_AriaLabel={0} - \u986F\u793A\u5C0E\u89BD\u529F\u80FD\u8868
 ShowAllMyApps_AriaLabel={0} - \u986F\u793A\u6240\u4EE5\u6211\u7684\u61C9\u7528\u7A0B\u5F0F
 AnchorNavigationBar_AriaLabel=\u7FA4\u7D44\u5C0E\u89BD
-SecondaryContent_AriaLabel=\u6B21\u8981\u5167\u5BB9
-ShellLayout.AriaLabel=Shell \u5167\u5BB9
+SidePane_AriaLabel=\u6B21\u8981\u5167\u5BB9
+ShellContent.AriaLabel=Shell \u5167\u5BB9
 ToolArea_AriaLabel=\u5DE5\u5177\u5340
 FloatingContainer_AriaLabel=\u6D6E\u9EDE\u5132\u5B58\u5340
 ShellNavigationMenu_HierarchyItemsAriaLabel=\u968E\u5C64\u5C0E\u89BD
@@ -817,9 +816,10 @@ AppearanceTileSizeSmall=\u5C0F
 AppearanceTileSizeLarge=\u5927
 appearanceTileSizeDescriptionText=\u5728\u684C\u9762\u88DD\u7F6E\u7684\u9996\u9801\u4E0A\u8A2D\u5B9A\u529F\u80FD\u78DA\u5927\u5C0F\uFF0C\u884C\u52D5\u88DD\u7F6E\u4E0A\u7684\u529F\u80FD\u78DA\u5927\u5C0F\u4E00\u5F8B\u70BA\u5C0F\u5716\u793A\u4E14\u4E0D\u53D7\u6B64\u8A2D\u5B9A\u5F71\u97FF\u3002
 appearanceCompactCozyDescriptionText=\u589E\u52A0\u63A7\u5236\u9805\u7684\u5927\u5C0F\u548C\u9593\u8DDD\uFF0C\u8B93\u60A8\u66F4\u8F15\u9B06\u5730\u4F7F\u7528\u6307\u5C16\u9032\u884C\u4E92\u52D5\u3002\u9019\u5C0D\u7D50\u5408\u89F8\u63A7\u548C\u6ED1\u9F20\u4E8B\u4EF6\u7684\u6DF7\u548C\u88DD\u7F6E\u7279\u5225\u5BE6\u7528\u3002
+AppearanceShowContentProviderInfoOnVisualizationsLabel=\u5728\u529F\u80FD\u78DA\u4E0A\u986F\u793A\u4F86\u6E90\u7CFB\u7D71\u540D\u7A31
+AppearanceShowContentProviderInfoOnVisualizationsText=\u76F4\u63A5\u5728\u529F\u80FD\u78DA\u4E0A\u986F\u793A\u61C9\u7528\u7A0B\u5F0F\u7684\u4F86\u6E90\u7CFB\u7D71\u3002\u82E5\u60A8\u4F7F\u7528\u7684\u61C9\u7528\u7A0B\u5F0F\u53EF\u5728\u591A\u91CD\u7CFB\u7D71\u4E2D\u63D0\u4F9B\u6642\uFF0C\u5EFA\u8B70\u60A8\u555F\u7528\u6B64\u8A2D\u5B9A\u3002
 AppearanceDarkModeLabel=\u81EA\u52D5\u6DF1\u8272\u6A21\u5F0F\u5075\u6E2C
-AppearanceDarkModeDetectionTooltip=\u555F\u7528\u81EA\u52D5\u6DF1\u8272\u6A21\u5F0F\u5075\u6E2C
-appearanceDarkModeDetectionText=\u6839\u64DA\u60A8\u7684\u4F5C\u696D\u7CFB\u7D71\u8A2D\u5B9A\uFF0C\u555F\u7528\u76F8\u5BB9\u4E3B\u984C\u7684\u81EA\u52D5\u6DF1\u8272\u6A21\u5F0F\u5075\u6E2C\u3002
+AppearanceDarkModeDetectionText=\u6839\u64DA\u60A8\u7684\u4F5C\u696D\u7CFB\u7D71\u8A2D\u5B9A\uFF0C\u555F\u7528\u76F8\u5BB9\u4E3B\u984C\u7684\u81EA\u52D5\u6DF1\u8272\u6A21\u5F0F\u5075\u6E2C\u3002
 AppearanceHighContrastTheme={0} \u9AD8\u5C0D\u6BD4
 LanguageAndRegionHelpingText=\u7576\u60A8\u5132\u5B58\u8A2D\u5B9A\u5F8C\uFF0C\u700F\u89BD\u5668\u6703\u91CD\u65B0\u6574\u7406\u4EE5\u4FBF\u65B0\u8A2D\u5B9A\u751F\u6548\u3002
 TimeZoneHelpingText=\u6642\u5340\u5C07\u4E0D\u6703\u5728 UI5 \u61C9\u7528\u7A0B\u5F0F\u4E2D\u5957\u4EF6\u3002\n\u82E5\u60A8\u4E0D\u77E5\u9053\u61C9\u7528\u7A0B\u5F0F\u985E\u578B\uFF0C\u5247\u53EF\u5728\u300C\u61C9\u7528\u7A0B\u5F0F\u67B6\u69CB ID\u300D\u6B04\u4F4D\u7684 [\u95DC\u65BC] \u5C0D\u8A71\u4E2D\u67E5\u770B\u5176\u985E\u578B\u3002
@@ -966,17 +966,15 @@ MyHome.InitialPage.Message.HidePage=\u60A8\u8981\u96B1\u85CF\u6B64\u9801\u9762\u
 MyHome.InitialPage.Message.GoToUserSettings=\u524D\u5F80\u4F7F\u7528\u8005\u8A2D\u5B9A\u3002
 MyHome.InitialPage.Message.ImportSuccessful=\u532F\u5165\u6210\u529F
 
-ContentFinder.AppBox.Button.Tooltip.LaunchApplication=\u555F\u52D5\u61C9\u7528\u7A0B\u5F0F
-ContentFinder.AppBox.Label.Type=\u985E\u578B\uFF1A
-ContentFinder.AppBox.Label.Information=\u8CC7\u8A0A\uFF1A
-ContentFinder.AppBox.Label.FioriId=SAP Fiori ID\uFF1A
-ContentFinder.AppBox.Label.SystemId=\u7CFB\u7D71 ID\uFF1A
-ContentFinder.AppBox.Label.Preview=\u9810\u89BD\uFF1A
-ContentFinder.AppBox.Text.FieldEmpty=\u7121\u6CD5\u4F7F\u7528
-ContentFinder.AppBox.Button.Preview=\u9810\u89BD
-ContentFinder.AppBox.Button.Close=\u95DC\u9589
-ContentFinder.Categories.Applications.Title=\u61C9\u7528\u7A0B\u5F0F
-ContentFinder.Widgets.Tiles.Title=\u529F\u80FD\u78DA
-ContentFinder.Widgets.Tiles.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89BA\u8868\u793A\u65B9\u5F0F\u3002
-ContentFinder.Widgets.Cards.Title=\u5361\u7247
-ContentFinder.Widgets.Cards.Description=\u61C9\u7528\u7A0B\u5F0F\u7684\u8996\u89BA\u8868\u793A\u65B9\u5F0F (\u4F9D\u5F48\u6027\u914D\u7F6E\u986F\u793A)\u3002
+
+NavigationBarMenu.PinnedSpaces.Title=\u5DF2\u56FA\u5B9A\u7A7A\u9593 ({0})
+NavigationBarMenu.AllSpaces.Title=\u6240\u6709\u7A7A\u9593
+NavigationBarMenu.Button.PinSpace=\u56FA\u5B9A\u7A7A\u9593
+NavigationBarMenu.Button.UnpinSpace=\u53D6\u6D88\u56FA\u5B9A\u7A7A\u9593
+NavigationBarMenu.Button.UnpinAll=\u5168\u90E8\u53D6\u6D88\u56FA\u5B9A
+NavigationBarMenu.Button.UnpinAll.Tooltip=\u53D6\u6D88\u56FA\u5B9A\u6240\u6709\u7A7A\u9593
+NavigationBarMenu.PinnedSpaces.NoDataText=\u5C07\u60A8\u7684\u6700\u611B\u7A7A\u9593\u56FA\u5B9A\u81F3\u700F\u89BD\u5217\u3002
+NavigationBarMenu.AllSpaces.NoDataText=\u672A\u5C07\u7A7A\u9593\u6307\u6D3E\u7D66\u60A8\u3002
+NavigationBarMenu.Button.OpenPopover=\u500B\u4EBA\u5316\u700F\u89BD\u5217
+
+SysInfoBarAriaLabel=\u7CFB\u7D71\u8CC7\u8A0A\u5217 - {0} {1}

package/src/main/js/sap/ushell/renderers/fiori2/search/searchComponent/manifest.json

@@ -3,7 +3,7 @@
     "sap.app": {
         "id": "sap.ushell.renderers.fiori2.search.searchComponent",
         "applicationVersion": {
-            "version": "1.113.0"
+            "version": "1.115.0"
         },
         "type": "component"
     },

package/src/main/js/sap/ushell/services/AppConfiguration.js

@@ -144,7 +144,9 @@ sap.ui.define([
          *
          * @param {Object} [oApplication] oApplication
          * @returns {object} A copy of the metadata object
+         *
          * @private
+         * @ui5-restricted sap.feedback.ui
          */
         this.getMetadata = function (oApplication) {
             if (!oApplication) {

package/src/main/js/sap/ushell/services/AppLifeCycle.js

@@ -3,7 +3,7 @@
  * @fileOverview The Unified Shell's AppLifeCycle service enables plug-ins to enquire the which
  *    application is currently displayed and listen to life cycle events.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",
@@ -15,7 +15,6 @@ sap.ui.define([
     "sap/ushell/TechnicalParameters",
     "sap/ui/core/Component",
     "sap/ushell/services/AppConfiguration",
-    "sap/ushell/services/_MessageBroker/MessageBrokerEngine",
     "sap/ushell/utils/UrlParsing"
 ], function (
     Log,
@@ -27,7 +26,6 @@ sap.ui.define([
     TechnicalParameters,
     Component,
     AppConfiguration,
-    MessageBrokerEngine,
     UrlParsing
 ) {
     "use strict";
@@ -35,29 +33,25 @@ sap.ui.define([
     var S_APP_LOADED_EVENT = "appLoaded";
 
     /**
-     * The Unified Shell's AppLifeCycle service
-     * This method MUST be called by the Unified Shell's container only, others
-     * MUST call <code>sap.ushell.Container.getServiceAsync("AppLifeCycle").then(function (AppLifeCycle) {});</code>.
-     * Constructs a new instance of the AppLifeCycle service.
-     *
-     * @name sap.ushell.services.AppLifeCycle
-     *
-     * @param {object} oAdapter
-     *   The service adapter for the AppLifeCycle service,
-     *   as already provided by the container
-     * @param {object} oContainerInterface interface
-     * @param {string} sParameter Service instantiation
-     * @param {object} oConfig service configuration (not in use)
+     * @alias sap.ushell.services.AppLifeCycle
+     * @classdesc The Unified Shell's AppLifeCycle service.
      *
+     * <b>Please note:</b> To retrieve a valid instance of this service you must call
+     * <code>sap.ushell.Container.getServiceAsync("AppLifeCycle")</code>. For details see
+     * {@link sap.ushell.services.Container#getServiceAsync}.
      *
      * @constructor
-     * @class
-     * @see sap.ushell.services.Container#getServiceAsync
+     * @hideconstructor
+     *
+     * @param {object} oAdapter not used
+     * @param {object} oContainerInterface not used
+     * @param {string} sParameters not used
+     * @param {object} oServiceConfiguration not used
      *
      * @since 1.38
      * @public
      */
-    function AppLifeCycle (oAdapter, oContainerInterface, sParameter, oConfig) {
+    function AppLifeCycle (oAdapter, oContainerInterface, sParameters, oServiceConfiguration) {
 
         var oCurrentApplication,
             oCurrentApplicationContainer,
@@ -179,22 +173,38 @@ sap.ui.define([
 
         this.setAppInfo = function (oAppInfo, bIsNewApp) {
             AppInfoParameters.setCustomAttributes(oAppInfo);
-            oCurrentApplication.getAllAppInfo(true).then(function (data) {
-                MessageBrokerEngine.publish("flp-app-info", "FLP", Date.now().toString(), (bIsNewApp === true ? "new app info" : "app info update"), "*" , data);
+            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                if (oMessageBrokerService.isEnabled()) {
+                    oCurrentApplication.getAllAppInfo(true).then(function (data) {
+                        oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), (bIsNewApp === true ? "new-app-info" : "app-info-update"), "*", data);
+                    });
+                }
             });
         };
 
+        function handleMessageBrokerIncommingMessage (oMessageBrokerService, sClientId, sChannelId, sMessageName, data) {
+            if (sChannelId === "flp-app-info" && sMessageName === "get-current-app-info" && oCurrentApplication) {
+                oCurrentApplication.getAllAppInfo(true).then(function (appData) {
+                    oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), sMessageName, [sClientId], appData);
+                });
+            }
+        }
+
         // CONSTRUCTOR CODE //
         if (window.QUnit === undefined && sap.ushell.Container.inAppRuntime() === false) {
-            MessageBrokerEngine.subscribe(
-                "FLP",
-                [{
-                    channelId: "flp-app-info",
-                    version: "1.0"
-                }],
-                function () {},
-                function () {}
-            );
+            sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                if (oMessageBrokerService.isEnabled()) {
+                    oMessageBrokerService.subscribe(
+                        "FLP",
+                        [{
+                            channelId: "flp-app-info",
+                            version: "1.0"
+                        }],
+                        handleMessageBrokerIncommingMessage.bind(undefined, oMessageBrokerService),
+                        function () {}
+                    );
+                }
+            });
         }
         oEventProvider = new EventProvider();
         if (sap.ushell.Container.inAppRuntime() === false) {
@@ -369,8 +379,12 @@ sap.ui.define([
             setTimeout(function () {
                 oEventProvider.fireEvent(S_APP_LOADED_EVENT, oCurrentApplication);
                 if (window.QUnit === undefined && sap.ushell.Container.inAppRuntime() === false) {
-                    oCurrentApplication.getAllAppInfo(true).then(function (data) {
-                        MessageBrokerEngine.publish("flp-app-info", "FLP", Date.now().toString(), "new app info", "*" , data);
+                    sap.ushell.Container.getServiceAsync("MessageBroker").then(function (oMessageBrokerService) {
+                        if (oMessageBrokerService.isEnabled()) {
+                            oCurrentApplication.getAllAppInfo(true).then(function (data) {
+                                oMessageBrokerService.publish("flp-app-info", "FLP", Date.now().toString(), "new-app-info", "*", data);
+                            });
+                        }
                     });
                 }
             }, 0);

package/src/main/js/sap/ushell/services/AppState.js

@@ -6,7 +6,7 @@
  * This is *not* an application facing service, but for Shell Internal usage.
  * This service should be accessed by the application via the CrossApplicationNavigation service.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ui/base/Object",
@@ -300,6 +300,27 @@ sap.ui.define([
         return this._oAdapter.saveAppState(sKey, sSessionKey, sData, sAppName, sComponent, bUseTransientAppState, iPersistencyMethod, oPersistencySettings);
     };
 
+    /**
+     * Check if the application state key contains JSON data
+     *
+     * @param {string} sKey Application State key
+     * @returns {boolean} true if the key is a JSON string
+     * @private
+     * @since 1.114.0
+     */
+    AppState.prototype._keyIsJson = function (sKey) {
+        if (typeof sKey === "string" && sKey.indexOf("{") === 0) {
+            // key may contain JSON data itself
+            try {
+                JSON.parse(sKey);
+                return true;
+            } catch (err) {
+                return false;
+            }
+        }
+        return false;
+    };
+
     /**
      * Method to load an application state
      *
@@ -309,6 +330,9 @@ sap.ui.define([
      * @since 1.28.0
      */
     AppState.prototype._loadAppState = function (sKey) {
+        if (this._keyIsJson(sKey)) {
+            return new jQuery.Deferred().resolve(sKey, sKey).promise();
+        }
         return this._oAdapter.loadAppState(sKey);
     };
 
@@ -453,6 +477,11 @@ sap.ui.define([
             return oDeferred.resolve(key);
         }
 
+        // app state in JSON form is self-persistent
+        if (this._keyIsJson(key)) {
+            return oDeferred.resolve(key);
+        }
+
         if (this.isPersistencyMethodSupported(persistencyMethod)) {
             this.getAppState(key)
                 .done(function (oAppState) {

package/src/main/js/sap/ushell/services/Bookmark.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's bookmark service, which allows you to create shortcuts on the
  * user's home page.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ui/thirdparty/jquery",
@@ -30,17 +30,17 @@ sap.ui.define([
     var ContentNodeType = ushellLibrary.ContentNodeType;
 
     /**
-     * This method MUST be called by the Unified Shell's container only, others MUST call
-     * <code>sap.ushell.Container.getServiceAsync("Bookmark").then(function (Bookmark) {});</code>.
-     * Constructs a new instance of the bookmark service.
-     *
-     * @name sap.ushell.services.Bookmark
-     *
-     * @class The unified shell's bookmark service, which allows you to create shortcuts on the
+     * @alias sap.ushell.services.Bookmark
+     * @classdesc The Unified Shell's bookmark service, which allows you to create shortcuts on the
      * user's home page.
      *
+     * <b>Please note:</b> To retrieve a valid instance of this service you must call
+     * <code>sap.ushell.Container.getServiceAsync("Bookmark")</code>. For details see
+     * {@link sap.ushell.services.Container#getServiceAsync}.
+     *
      * @constructor
-     * @see sap.ushell.services.Container#getServiceAsync
+     * @hideconstructor
+     *
      * @since 1.15.0
      * @public
      */
@@ -130,7 +130,7 @@ sap.ui.define([
          *   The refresh interval for the <code>serviceUrl</code> in seconds.
          * @param {string} [oParameters.numberUnit]
          *   The unit for the number retrieved from <code>serviceUrl</code>.
-         * @param {(object|sap.ushell.services.Bookmark.ContentNode|sap.ushell.services.Bookmark.ContentNode[])} [vContainer]
+         * @param {object|sap.ushell.services.Bookmark.ContentNode|sap.ushell.services.Bookmark.ContentNode[]} [vContainer]
          *   Either a legacy launchpad home page group, one content node or an array of content nodes. (See {@link #getContentNodes})
          *   If not provided, the bookmark will be added to the default group if spaces mode is not active
          *   or to the default page if spaces mode is active.
@@ -749,15 +749,17 @@ sap.ui.define([
          *
          * @param {string} sUrl
          *   The URL of the bookmarks to be counted, exactly as specified to {@link #addBookmark}.
+         * @param {string} sContentProviderId
+         *   The Content Provider ID.
          *
          * @returns {jQuery.Promise}
          *   A <code>jQuery.Promise</code> which informs about success or failure
          *   of this asynchronous operation. In case of success, the count of existing bookmarks
          *   is provided (which might be zero). In case of failure, an error message is passed.
+         *
          * @see #addBookmark
          * @since 1.17.1
          * @public
-         * @alias sap.ushell.services.Bookmark#countBookmarks
          */
         this.countBookmarks = function (sUrl, sContentProviderId) {
             var oDeferred = new jQuery.Deferred();
@@ -922,8 +924,39 @@ sap.ui.define([
          *   In case you need to update the URL itself, pass the old one here and the new one as
          *   <code>oParameters.url</code>!
          * @param {object} oParameters
-         *   The bookmark parameters as documented in {@link #addBookmark}.
+         *   Bookmark parameters. In addition to title and URL, a bookmark might allow additional
+         *   settings, such as an icon or a subtitle. Which settings are supported depends
+         *   on the environment in which the application is running. Unsupported parameters will be
+         *   ignored.
+         * @param {string} oParameters.title
+         *   The title of the bookmark.
+         * @param {string} oParameters.url
+         *   The target URL or intent of the bookmark. If the target application shall run in the current shell, the URL has
+         *   to be a valid intent, i.e. in the format like <code>"#SO-Action?P1=a&P2=x&/route?RPV=1"</code>.
+         * @param {string} [oParameters.icon]
+         *   The optional icon URL of the bookmark (e.g. <code>"sap-icon://home"</code>).
+         * @param {string} [oParameters.info]
+         *   The information text of the bookmark.
+         * @param {string} [oParameters.subtitle]
+         *   The subtitle of the bookmark.
+         * @param {string} [oParameters.serviceUrl]
+         *   The URL to a REST or OData service that provides some dynamic information for the
+         *   bookmark.
+         * @param {object} [oParameters.dataSource]
+         *   Metadata for parameter serviceUrl. Mandatory to specify if parameter serviceURL contains semantic date ranges.
+         *   This does not influence the data source of the app itself.
+         * @param {string} [oParameters.dataSource.type]
+         *   The type of the serviceURL's service. Only "OData" is supported.
+         * @param {object} [oParameters.dataSource.settings]
+         *   Additional settings for the data source.
+         * @param {object} [oParameters.dataSource.settings.odataVersion]
+         *   The OData version of parameter serviceURL. Valid values are "2.0" and "4.0".
+         * @param {string} [oParameters.serviceRefreshInterval]
+         *   The refresh interval for the <code>serviceUrl</code> in seconds.
+         * @param {string} [oParameters.numberUnit]
+         *   The unit for the number retrieved from <code>serviceUrl</code>.
          * @param {string} [sContentProviderId] The contentProviderId or undefined outside the cFLP
+         *
          * @returns {jQuery.Promise}
          *   A <code>jQuery.Promise</code> which informs about success or
          *   failure of this asynchronous operation. In case of success, the number of updated

package/src/main/js/sap/ushell/services/ClientSideTargetResolution.js

@@ -29,7 +29,7 @@
  * In the future, the custom resolver mechanism should be probably moved towards modifying (or only adding to the list of Inbounds),
  * this way a single data source has to be altered to support consistently getLinks, isIntentSupported.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/CommonDataModel.js

@@ -2,7 +2,7 @@
 
 /**
  * @file Exposes a CommonDataModel based site document in a platform neutral format to it's clients
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/services/_CommonDataModel/PersonalizationProcessor",

package/src/main/js/sap/ushell/services/Configuration.js

@@ -4,7 +4,7 @@
  * @fileOverview The Unified Shell's Configuration service enables Components of any kind to consume parts of Configuration
  * provided by the shell. It allows to attach on updates and receive the current values
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/Config",

package/src/main/js/sap/ushell/services/ConfigurationDefaults.js

@@ -3,7 +3,7 @@
 /**
  * @fileOverview The Unified Shell's Configuration Defaults service exposes default configurations set in the code base.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/ContentExtensionAdapterFactory.js

@@ -4,25 +4,23 @@
  * default adapter.
  * Once instantiated, returns a map of adapters to be used by the LaunchPage Service
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/Config",
     "sap/ushell/services/_ContentExtensionAdapterFactory/ContentExtensionAdapterConfig",
-    "sap/ui/thirdparty/jquery",
-    "sap/base/util/ObjectPath"
+    "sap/ui/thirdparty/jquery"
 ], function (
     Config,
     ContentExtensionAdapterConfig,
-    jQuery,
-    ObjectPath
+    jQuery
 ) {
     "use strict";
 
     /**
      * @name sap.ushell.services.ContentExtensionAdapterFactory
      * @since 1.62.0
-     * @experimental
+     * @deprecated
      * @protected
      */
     var ContentExtensionFactory = {};

package/src/main/js/sap/ushell/services/CrossApplicationNavigation.js

@@ -5,7 +5,7 @@
  * This file exposes an API to perform (invoke) Cross Application Navigation for applications.
  * It exposes interfaces to perform a hash change and/or trigger an external navigation.
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/ushell/services/AppConfiguration",
@@ -47,10 +47,8 @@ sap.ui.define([
     "use strict";
 
     /**
-     * @class
      * @alias sap.ushell.services.CrossApplicationNavigation
-     * @classdesc
-     * The Unified Shell's CrossApplicationNavigation service allows to navigate to "external" targets outside of the currently running app (but still in scope
+     * @classdesc The Unified Shell's CrossApplicationNavigation service allows to navigate to "external" targets outside of the currently running app (but still in scope
      * of the current Fiori launchpad) or create links to such external targets.
      *
      * To use the CrossApplicationNavigation service you can retrieve an instance via ushell's Container:
@@ -108,6 +106,7 @@ sap.ui.define([
      * @param {string} sParameters The parameters.
      * @param {object} oServiceConf Service Configuration.
      *
+     * @constructor
      * @hideconstructor
      *
      * @see sap.ushell.services.Container#getServiceAsync
@@ -1338,6 +1337,7 @@ sap.ui.define([
          * Resolves the given semantic object (and action) and business parameters to a list of links available to the user.
          *
          * @param {object|object[]} [vArgs] An object containing nominal arguments for the method, having the following structure:
+         *
          *   <pre>
          *   {
          *      semanticObject: "Object", // optional, matches any semantic objects if undefined
@@ -1355,19 +1355,16 @@ sap.ui.define([
          *                               //   - "text" lexicographical sort on returned 'text' field
          *                               //   - "priority" experimental - top intents are returned first
          *
-         *      treatTechHintAsFilter : true, // optional, defaults to false
-         *                                    // if true, only apps that match
-         *                                    // exactly the supplied technology
-         *                                    // (e.g. sap-ui-tech-hint=WDA) will be considered
+         *      treatTechHintAsFilter : true, // optional, defaults to false.
+         *                                    // if true, only apps that match exactly the supplied technology (e.g. sap-ui-tech-hint=WDA) will be considered.
          *
          *      ui5Component: UI5Component, // mandatory, the UI5 component invoking the service, shall be a root component!
          *
-         *      appStateKey: "abc123...",   // optional, application state key to add to the generated links, SAP internal usage only
+         *      appStateKey: "abc123...",   // optional, application state key to add to the generated links, SAP internal usage only.
          *
-         *      compactIntents: true        // optional, whether intents should be returned in compact format.
-         *                                  // Defaults to false.
+         *      compactIntents: true        // optional, whether intents should be returned in compact format. Defaults to false.
          *
-         *      ignoreFormFactor: true,     // optional, defaults to false, deprecated, do not use, may have no effect in the future
+         *      ignoreFormFactor: true,     // optional, defaults to false, deprecated, do not use, may have no effect in the future.
          *
          *      tags: ["tag-1", "tag-2"]    // optional, if specified, only returns links that match inbound with certain tags.
          *   }
@@ -1420,8 +1417,19 @@ sap.ui.define([
          *   </pre>
          *
          *   <p>Calling this method with no arguments will produce the same result as if the method was called with an empty object.</p>
-         * @returns {jQuery.Deferred.promise} A promise that resolves with an array of link objects containing (at least)
-         *   the following properties:
+         *
+         * @param {string} [vArgs.semanticObject] Optional, matches any semantic objects if undefined
+         * @param {string} [vArgs.action] Optional, matches any actions if undefined
+         * @param {object} [vArgs.params] Optional business parameters
+         * @param {boolean} [vArgs.withAtLeastOneUsedParam] Optional, defaults to false. If true, returns only the links that use at least one (non sap-) parameter from 'params'.
+         * @param {string} [vArgs.sortResultsBy] Optional parameter that decides on how the returned results will be sorted.
+         * @param {boolean} [vArgs.treatTechHintAsFilter] Optional, defaults to false. If true, only apps that match exactly the supplied technology (e.g. sap-ui-tech-hint=WDA) will be considered.
+         * @param {sap.ui.core.Component} vArgs.ui5Component Mandatory, the UI5 component invoking the service, shall be a root component.
+         * @param {string} [vArgs.appStateKey] Optional, application state key to add to the generated links, SAP internal usage only.
+         * @param {boolean} [vArgs.compactIntents=false] Optional, whether intents should be returned in compact format. Defaults to false.
+         * @param {string[]} [vArgs.tags] Optional, if specified, only returns links that match inbound with certain tags.
+         *
+         * @returns {jQuery.Deferred.promise} A promise that resolves with an array of link objects containing (at least) the following properties:
          *  <pre>
          *   {
          *     intent: "#AnObject-Action?A=B&C=e&C=j",
@@ -1470,12 +1478,10 @@ sap.ui.define([
          *     ]
          *     </pre>
          * @public
-         * @alias sap.ushell.services.CrossApplicationNavigation#getLinks
          * @since 1.38.0
          */
         this.getLinks = function (vArgs) {
             var aExpandedIntents;
-
             /*
              * the invokeUnfoldingArrayArguments does not want [oArg1, oArg2, oArg3], but [ [oArg1], [oArg2], [oArg3] ], because the
              * logic in that method is based on positional parameters - however we have only one argument (the oArg object in this case).

package/src/main/js/sap/ushell/services/DarkModeSupport.js

@@ -5,7 +5,7 @@
  *
  * The service provide dark mode support functionality
  *
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",

package/src/main/js/sap/ushell/services/LaunchPage.js

@@ -2,7 +2,7 @@
 
 /**
  * @file The Unified Shell's page builder service providing the data for the Fiori launchpad's classic Homepage.
- * @version 1.113.0
+ * @version 1.115.0
  */
 sap.ui.define([
     "sap/base/Log",