@openui5/sap.m 1.112.0 → 1.113.0

package/src/sap/m/messagebundle_zh_CN.properties

@@ -41,7 +41,7 @@ LIST_ITEM_SELECTION=\u9879\u76EE\u9009\u62E9
 
 TABLE_NO_COLUMNS=\u8868\u4E2D\u6B64\u523B\u6CA1\u6709\u53EF\u89C1\u7684\u5217\u3002\u8BF7\u5728\u8868\u8BBE\u7F6E\u4E2D\u9009\u62E9\u6240\u9700\u7684\u5217\u3002
 
-TABLE_NO_COLUMNS_TITLE=\u6DFB\u52A0\u5217\u4EE5\u67E5\u770B\u5185\u5BB9\u3002
+TABLE_NO_COLUMNS_TITLE=\u6DFB\u52A0\u5217\u4EE5\u67E5\u770B\u5185\u5BB9
 
 TABLE_NO_COLUMNS_DESCRIPTION=\u5728\u8868\u8BBE\u7F6E\u4E2D\u9009\u62E9\u6240\u9700\u7684\u5217\u3002
 
@@ -512,7 +512,7 @@ UPLOAD_SET_NO_DATA_TEXT=\u672A\u627E\u5230\u6587\u4EF6\u3002
 
 UPLOAD_SET_NO_DATA_DESCRIPTION=\u653E\u7F6E\u6587\u4EF6\u4EE5\u8FDB\u884C\u4E0A\u8F7D\uFF0C\u6216\u4F7F\u7528 "+" \u6309\u94AE\u3002
 
-UPLOAD_SET_ILLUSTRATED_MESSAGE=This is an Illustrated Message.
+UPLOAD_SET_ILLUSTRATED_MESSAGE=\u6B64\u6D88\u606F\u6709\u63D2\u56FE\u3002
 
 
 
@@ -607,9 +607,17 @@ CONDITIONPANEL_OPTION_NUMERIC_LE=\u5C0F\u4E8E\u6216\u7B49\u4E8E
 p13n.VIEW_SETTINGS=\u89C6\u56FE\u8BBE\u7F6E
 p13n.RESET_WARNING_TEXT=\u5373\u5C06\u91CD\u7F6E\u5BF9\u89C6\u56FE\u8BBE\u7F6E\u6240\u505A\u7684\u6240\u6709\u66F4\u6539\u5E76\u8FD8\u539F\u4E3A\u6240\u9009\u89C6\u56FE\u3002
 p13n.MOVE_TO_TOP=\u79FB\u52A8\u5230\u9876\u90E8
+p13n.SHORTCUT_MOVE_TO_TOP_MAC=Cmd+Home
+p13n.SHORTCUT_MOVE_TO_TOP=Ctrl+Home
 p13n.MOVE_UP=\u4E0A\u79FB
+p13n.SHORTCUT_MOVE_UP_MAC=Cmd+\u5149\u6807\u4E0A\u79FB
+p13n.SHORTCUT_MOVE_UP=Ctrl+\u5149\u6807\u4E0A\u79FB
 p13n.MOVE_DOWN=\u4E0B\u79FB
+p13n.SHORTCUT_MOVE_DOWN_MAC=Cmd+\u5149\u6807\u4E0B\u79FB
+p13n.SHORTCUT_MOVE_DOWN=Ctrl+\u5149\u6807\u4E0B\u79FB
 p13n.MOVE_TO_BOTTOM=\u79FB\u52A8\u5230\u5E95\u90E8
+p13n.SHORTCUT_MOVE_TO_BOTTOM_MAC=Cmd+End
+p13n.SHORTCUT_MOVE_TO_BOTTOM=Ctrl+End
 p13n.HEADER_COUNT=({0}/{1})
 p13n.SORT_ASCENDING=\u5347\u5E8F
 p13n.SORT_DESCENDING=\u964D\u5E8F
@@ -1206,6 +1214,8 @@ TABLE_ICON_DESELECT_ALL=\u53D6\u6D88\u9009\u62E9\u6240\u6709\u884C
 
 TABLE_ARIA_LABEL=\u8868\u683C\u5217\u8868
 
+TABLE_SELECT_ALL_TOOLTIP=\u5168\u9009
+
 TABLE_CLEARBUTTON_TOOLTIP=\u53D6\u6D88\u5168\u9009
 
 TABLE_CONTAINER_ROLE_DESCRIPTION=\u8868\u683C\u5217\u8868\u5BB9\u5668
@@ -1608,9 +1618,9 @@ IllustratedMessage_TITLE_NoTasks=\u6CA1\u6709\u4EFB\u4F55\u65B0\u4EFB\u52A1
 
 IllustratedMessage_DESCRIPTION_NoTasks=\u6709\u4EFB\u52A1\u65F6\uFF0C\u5C06\u4F1A\u5728\u6B64\u770B\u5230\u3002
 
-IllustratedMessage_TITLE_NoColumnsSet=Add columns to see the content
+IllustratedMessage_TITLE_NoColumnsSet=\u6DFB\u52A0\u5217\u4EE5\u67E5\u770B\u5185\u5BB9
 
-IllustratedMessage_DESCRIPTION_NoColumnsSet=Select the columns you need in the table settings.
+IllustratedMessage_DESCRIPTION_NoColumnsSet=\u5728\u8868\u8BBE\u7F6E\u4E2D\u9009\u62E9\u6240\u9700\u7684\u5217\u3002
 
 IllustratedMessage_TITLE_UnableToLoad=\u65E0\u6CD5\u52A0\u8F7D\u6570\u636E
 
@@ -1684,6 +1694,10 @@ IllustratedMessage_TITLE_UploadToCloud=\u8FC1\u79FB\u5230 SAP Integration Suite
 
 IllustratedMessage_DESCRIPTION_UploadToCloud=\u5C06\u96C6\u6210\u5185\u5BB9\u4ECE\u73B0\u6709\u6D41\u7A0B\u96C6\u6210\u8BA2\u9605\u79FB\u52A8\u5230\u4E91\u96C6\u6210\u529F\u80FD\u3002
 
+IllustratedMessage_TITLE_Survey=\u60A8\u7684\u610F\u89C1\u81F3\u5173\u91CD\u8981
+
+IllustratedMessage_DESCRIPTION_Survey=\u6211\u4EEC\u5E0C\u671B\u4E86\u89E3\u60A8\u5BF9 SAP \u8F6F\u4EF6\u7684\u770B\u6CD5\u3002\u505A\u4E00\u4E2A\u7B80\u77ED\u8C03\u67E5\u6765\u4E0E\u6211\u4EEC\u5206\u4EAB\u60A8\u7684\u53CD\u9988\u3002\u53EA\u9700\u82B1\u51E0\u5206\u949F\u65F6\u95F4\u3002
+
 VARIANT_MANAGEMENT_SAVE=\u4FDD\u5B58
 
 VARIANT_MANAGEMENT_SAVEAS=\u53E6\u5B58\u4E3A

package/src/sap/m/messagebundle_zh_TW.properties

@@ -512,7 +512,7 @@ UPLOAD_SET_NO_DATA_TEXT=\u627E\u4E0D\u5230\u6A94\u6848\u3002
 
 UPLOAD_SET_NO_DATA_DESCRIPTION=\u62D6\u653E\u6A94\u6848\u4EE5\u4E0A\u50B3\uFF0C\u6216\u4F7F\u7528 "+" \u6309\u9215
 
-UPLOAD_SET_ILLUSTRATED_MESSAGE=This is an Illustrated Message.
+UPLOAD_SET_ILLUSTRATED_MESSAGE=\u6B64\u70BA\u5716\u89E3\u5F0F\u8A0A\u606F\u3002
 
 
 
@@ -607,9 +607,17 @@ CONDITIONPANEL_OPTION_NUMERIC_LE=\u5C0F\u65BC\u6216\u7B49\u65BC
 p13n.VIEW_SETTINGS=\u6AA2\u8996\u8A2D\u5B9A
 p13n.RESET_WARNING_TEXT=\u60A8\u5373\u5C07\u91CD\u8A2D\u91DD\u5C0D\u6AA2\u8996\u8A2D\u5B9A\u6240\u5B8C\u6210\u7684\u5168\u90E8\u66F4\u6539\u5167\u5BB9\u4E26\u56DE\u5230\u6240\u9078\u6AA2\u8996\u3002
 p13n.MOVE_TO_TOP=\u79FB\u81F3\u9802\u7AEF
+p13n.SHORTCUT_MOVE_TO_TOP_MAC=Cmd+Home
+p13n.SHORTCUT_MOVE_TO_TOP=Ctrl+Home
 p13n.MOVE_UP=\u4E0A\u79FB
+p13n.SHORTCUT_MOVE_UP_MAC=Cmd+\u6E38\u6A19\u5F80\u4E0A\u79FB\u52D5
+p13n.SHORTCUT_MOVE_UP=Ctrl+\u6E38\u6A19\u5F80\u4E0A\u79FB\u52D5
 p13n.MOVE_DOWN=\u4E0B\u79FB
+p13n.SHORTCUT_MOVE_DOWN_MAC=Cmd+\u6E38\u6A19\u5F80\u4E0B\u79FB\u52D5
+p13n.SHORTCUT_MOVE_DOWN=Ctrl+\u6E38\u6A19\u5F80\u4E0B\u79FB\u52D5
 p13n.MOVE_TO_BOTTOM=\u79FB\u81F3\u5E95\u7AEF
+p13n.SHORTCUT_MOVE_TO_BOTTOM_MAC=Cmd+End
+p13n.SHORTCUT_MOVE_TO_BOTTOM=Ctrl+End
 p13n.HEADER_COUNT=({0}/{1})
 p13n.SORT_ASCENDING=\u905E\u589E
 p13n.SORT_DESCENDING=\u905E\u6E1B
@@ -1206,6 +1214,8 @@ TABLE_ICON_DESELECT_ALL=\u53D6\u6D88\u9078\u64C7\u6240\u6709\u5217
 
 TABLE_ARIA_LABEL=\u8868\u683C\u6E05\u55AE
 
+TABLE_SELECT_ALL_TOOLTIP=\u5168\u9078
+
 TABLE_CLEARBUTTON_TOOLTIP=\u53D6\u6D88\u5168\u9078
 
 TABLE_CONTAINER_ROLE_DESCRIPTION=\u8868\u683C\u6E05\u55AE\u5132\u5B58\u5340
@@ -1608,9 +1618,9 @@ IllustratedMessage_TITLE_NoTasks=\u60A8\u6C92\u6709\u65B0\u5DE5\u4F5C\u7D30\u980
 
 IllustratedMessage_DESCRIPTION_NoTasks=\u82E5\u51FA\u73FE\u5DE5\u4F5C\u7D30\u9805\uFF0C\u60A8\u4FBF\u6703\u5728\u6B64\u8655\u770B\u5230\u3002
 
-IllustratedMessage_TITLE_NoColumnsSet=Add columns to see the content
+IllustratedMessage_TITLE_NoColumnsSet=\u65B0\u589E\u6B04\u4F4D\u4EE5\u67E5\u770B\u5167\u5BB9
 
-IllustratedMessage_DESCRIPTION_NoColumnsSet=Select the columns you need in the table settings.
+IllustratedMessage_DESCRIPTION_NoColumnsSet=\u5728\u8868\u683C\u8A2D\u5B9A\u4E2D\u9078\u64C7\u60A8\u9700\u8981\u7684\u6B04\u4F4D\u3002
 
 IllustratedMessage_TITLE_UnableToLoad=\u7121\u6CD5\u8F09\u5165\u8CC7\u6599
 
@@ -1684,6 +1694,10 @@ IllustratedMessage_TITLE_UploadToCloud=\u79FB\u8F49\u81F3 SAP Integration Suite
 
 IllustratedMessage_DESCRIPTION_UploadToCloud=\u5C07\u60A8\u7684\u6574\u5408\u5167\u5BB9\u5F9E\u73FE\u6709\u300C\u7A0B\u5E8F\u6574\u5408\u300D\u8A02\u95B1\u79FB\u5230\u300C\u96F2\u7AEF\u6574\u5408\u300D\u529F\u80FD\u3002
 
+IllustratedMessage_TITLE_Survey=\u60A8\u7684\u610F\u898B\u5167\u5BB9
+
+IllustratedMessage_DESCRIPTION_Survey=\u6211\u5011\u60F3\u77AD\u89E3\u60A8\u5C0D SAP \u8EDF\u9AD4\u7684\u60F3\u6CD5\uFF0C\u8ACB\u53C3\u8207\u7C21\u77ED\u8ABF\u67E5\u4EE5\u5206\u4EAB\u60A8\u7684\u53CD\u994B\uFF0C\u9019\u53EA\u9700\u8981\u6578\u5206\u9418\u6642\u9593\u3002
+
 VARIANT_MANAGEMENT_SAVE=\u5132\u5B58
 
 VARIANT_MANAGEMENT_SAVEAS=\u53E6\u5B58\u65B0\u6A94

package/src/sap/m/p13n/AbstractContainer.js

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 * @since 1.96
 	 *
 	 * @private

package/src/sap/m/p13n/AbstractContainerItem.js

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.112.0
+		 * @version 1.113.0
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.112.0
+		 * @version 1.113.0
 	 	 * @since 1.96
 	 	 * @private
 		 * @ui5-restricted

package/src/sap/m/p13n/BasePanel.js

@@ -5,8 +5,26 @@
  */
 
 sap.ui.define([
-	'sap/ui/model/json/JSONModel', 'sap/m/VBox', 'sap/ui/core/Control', 'sap/m/Column', 'sap/m/Text', 'sap/ui/model/Filter', "sap/m/Table", "sap/m/OverflowToolbar", "sap/m/SearchField", "sap/m/ToolbarSpacer", "sap/m/OverflowToolbarButton", "sap/m/OverflowToolbarLayoutData", "sap/ui/core/dnd/DragDropInfo"
-], function(JSONModel, VBox, Control, Column, Text, Filter, Table, OverflowToolbar, SearchField, ToolbarSpacer, OverflowToolbarButton, OverflowToolbarLayoutData, DragDropInfo) {
+	'sap/ui/model/json/JSONModel',
+	'sap/m/VBox',
+	'sap/ui/core/Control',
+	'sap/m/Column',
+	'sap/m/Text',
+	'sap/ui/model/Filter',
+	"sap/m/Table",
+	"sap/m/OverflowToolbar",
+	"sap/m/SearchField",
+	"sap/m/ToolbarSpacer",
+	"sap/m/OverflowToolbarButton",
+	"sap/m/OverflowToolbarLayoutData",
+	"sap/ui/core/dnd/DragDropInfo",
+	'sap/ui/core/ShortcutHintsMixin',
+	"sap/ui/events/KeyCodes",
+	"sap/base/Log",
+	"sap/ui/Device",
+	"sap/m/library",
+	"sap/base/util/UriParameters"
+], function(JSONModel, VBox, Control, Column, Text, Filter, Table, OverflowToolbar, SearchField, ToolbarSpacer, OverflowToolbarButton, OverflowToolbarLayoutData, DragDropInfo, ShortcutHintsMixin, KeyCodes, Log, Device, library, UriParameters) {
 	"use strict";
 
 	/**
@@ -34,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @public
 	 * @abstract
@@ -140,6 +158,9 @@ sap.ui.define([
 		}
 	});
 
+	// shortcut for sap.m.MultiSelectMode
+	var MultiSelectMode = library.MultiSelectMode;
+
 	//inner model name
 	BasePanel.prototype.P13N_MODEL = "$p13n";
 
@@ -155,6 +176,13 @@ sap.ui.define([
 	BasePanel.prototype.PRESENCE_ATTRIBUTE = "visible";
 	BasePanel.prototype.WIDTH = "30rem";
 
+	BasePanel.prototype.applySettings = function(mSettings) {
+		Control.prototype.applySettings.apply(this, arguments);
+		if (!mSettings || (mSettings && mSettings.enableReorder === undefined)) {
+			this._updateMovement(true);
+		}
+	};
+
 	BasePanel.prototype.init = function() {
 		Control.prototype.init.apply(this, arguments);
 
@@ -170,8 +198,9 @@ sap.ui.define([
 
 		this._setInnerLayout();
 
-		// disable 'select all'
-		this._oListControl.setMultiSelectMode("ClearAll");
+		// experimentally enable select all
+		var oParams = UriParameters.fromQuery(window.location.search);
+		this._oListControl.setMultiSelectMode(oParams.get("sap-ui-xx-p13nSelectAll") == "true" ? MultiSelectMode.SelectAll : MultiSelectMode.ClearAll);
 	};
 
 	BasePanel.prototype.onAfterRendering = function() {
@@ -311,23 +340,30 @@ sap.ui.define([
 	};
 
 	BasePanel.prototype._getMoveTopButton = function() {
-		if (!this._oMoveTopBtn) {
-			this._oMoveTopBtn = new OverflowToolbarButton(this.getId() + "-moveTopBtn",{
+		if (!this._oMoveTopButton) {
+			this._oMoveTopButton = new OverflowToolbarButton(this.getId() + "-moveTopBtn", {
 				type: "Transparent",
 				tooltip: this._getResourceText("p13n.MOVE_TO_TOP"),
 				icon: "sap-icon://collapse-group",
 				press: [this._onPressButtonMoveToTop, this],
 				visible: false
 			});
-			this.addDependent(this._oMoveTopBtn);
+			this.addDependent(this._oMoveTopButton);
+
+			ShortcutHintsMixin.addConfig(this._oMoveTopButton, {
+				addAccessibilityLabel: true,
+				message: this._getResourceText(Device.os.macintosh ? "p13n.SHORTCUT_MOVE_TO_TOP_MAC" : "p13n.SHORTCUT_MOVE_TO_TOP") // Cmd+Home or Ctrl+Home
+				},
+				this
+			);
 		}
 
-		return this._oMoveTopBtn;
+		return this._oMoveTopButton;
 	};
 
 	BasePanel.prototype._getMoveUpButton = function() {
 		if (!this._oMoveUpButton) {
-			this._oMoveUpButton = new OverflowToolbarButton(this.getId() + "-moveUpBtn",{
+			this._oMoveUpButton = new OverflowToolbarButton(this.getId() + "-moveUpBtn", {
 				type: "Transparent",
 				tooltip: this._getResourceText("p13n.MOVE_UP"),
 				icon: "sap-icon://navigation-up-arrow",
@@ -335,6 +371,14 @@ sap.ui.define([
 				visible: false
 			});
 			this.addDependent(this._oMoveUpButton);
+
+			ShortcutHintsMixin.addConfig(this._oMoveUpButton, {
+				addAccessibilityLabel: true,
+				message: this._getResourceText(Device.os.macintosh ? "p13n.SHORTCUT_MOVE_UP_MAC" : "p13n.SHORTCUT_MOVE_UP") // Cmd+CursorUp or Ctrl+CursorUp
+				},
+				this
+			);
+
 		}
 
 		return this._oMoveUpButton;
@@ -342,7 +386,7 @@ sap.ui.define([
 
 	BasePanel.prototype._getMoveDownButton = function() {
 		if (!this._oMoveDownButton) {
-			this._oMoveDownButton = new OverflowToolbarButton(this.getId() + "-moveDownpBtn",{
+			this._oMoveDownButton = new OverflowToolbarButton(this.getId() + "-moveDownpBtn", {
 				type: "Transparent",
 				tooltip: this._getResourceText("p13n.MOVE_DOWN"),
 				icon: "sap-icon://navigation-down-arrow",
@@ -350,6 +394,13 @@ sap.ui.define([
 				visible: false
 			});
 			this.addDependent(this._oMoveDownButton);
+
+			ShortcutHintsMixin.addConfig(this._oMoveDownButton, {
+				addAccessibilityLabel: true,
+				message: this._getResourceText(Device.os.macintosh ? "p13n.SHORTCUT_MOVE_DOWN_MAC" : "p13n.SHORTCUT_MOVE_DOWN") // Cmd+CursorDown or Ctrl+CursorDown
+				},
+				this
+			);
 		}
 
 		return this._oMoveDownButton;
@@ -357,7 +408,7 @@ sap.ui.define([
 
 	BasePanel.prototype._getMoveBottomButton = function() {
 		if (!this._oMoveBottomButton) {
-			this._oMoveBottomButton = new OverflowToolbarButton(this.getId() + "-moveBottomBtn",{
+			this._oMoveBottomButton = new OverflowToolbarButton(this.getId() + "-moveBottomBtn", {
 				type: "Transparent",
 				tooltip: this._getResourceText("p13n.MOVE_TO_BOTTOM"),
 				icon: "sap-icon://expand-group",
@@ -365,6 +416,14 @@ sap.ui.define([
 				visible: false
 			});
 			this.addDependent(this._oMoveBottomButton);
+
+			ShortcutHintsMixin.addConfig(this._oMoveBottomButton, {
+				addAccessibilityLabel: true,
+				message: this._getResourceText(Device.os.macintosh ? "p13n.SHORTCUT_MOVE_TO_BOTTOM_MAC" : "p13n.SHORTCUT_MOVE_TO_BOTTOM") // Cmd+End or Ctrl+End
+				},
+				this
+			);
+
 		}
 
 		return this._oMoveBottomButton;
@@ -372,8 +431,8 @@ sap.ui.define([
 
 	BasePanel.prototype._onResize = function(aResizeEntity) {
 		var oDomRect = aResizeEntity[0].contentRect;
-		if (this._oMoveTopBtn) {
-			this._oMoveTopBtn.setVisible(oDomRect.width > 400);
+		if (this._oMoveTopButton) {
+			this._oMoveTopButton.setVisible(oDomRect.width > 400);
 		}
 		if (this._oMoveBottomButton) {
 			this._oMoveBottomButton.setVisible(oDomRect.width > 400);
@@ -399,11 +458,49 @@ sap.ui.define([
 		if (oRow && oRow.aDelegates.length < 1) {
 			oRow.addEventDelegate({
 				onmouseover: this._hoverHandler.bind(this),
-				onfocusin: this._focusHandler.bind(this)
+				onfocusin: this._focusHandler.bind(this),
+				onkeydown: this._keydownHandler.bind(this)
 			});
 		}
 	};
 
+	BasePanel.prototype._keydownHandler = function(oEvent) {
+		if (!this.getEnableReorder()){
+			return;
+		}
+
+		if (oEvent.isMarked()) {
+			return;
+		}
+
+		// Log.info("onKeyDown", oEvent.ctrlKey  + " | " + oEvent.which + " | " + oEvent.key);
+
+		if ((oEvent.metaKey || oEvent.ctrlKey )) {
+			var oButton;
+			if (oEvent.which === KeyCodes.HOME) {
+				oButton = this._getMoveTopButton();
+			}
+			if (oEvent.which === KeyCodes.ARROW_UP) {
+				oButton = this._getMoveUpButton();
+			}
+			if (oEvent.which === KeyCodes.ARROW_DOWN) {
+				oButton = this._getMoveDownButton();
+			}
+			if (oEvent.which === KeyCodes.END) {
+				oButton = this._getMoveBottomButton();
+			}
+
+			if (oButton && oButton.getParent() && oButton.getVisible() && oButton.getEnabled()) {
+				// Mark the event to ensure that parent handlers (e.g. FLP) can skip their processing if needed. Also prevent potential browser defaults
+				oEvent.setMarked();
+				oEvent.preventDefault();
+
+				oButton.firePress();
+			}
+		}
+
+	};
+
 	BasePanel.prototype._focusHandler = function(oEvt) {
 		if (!this.getEnableReorder()){
 			return;
@@ -742,7 +839,7 @@ sap.ui.define([
 		this._oSelectionBindingInfo = null;
 		this._oSelectedItem = null;
 		this._oListControl = null;
-		this._oMoveTopBtn = null;
+		this._oMoveTopButton = null;
 		this._oMoveUpButton = null;
 		this._oMoveDownButton = null;
 		this._oMoveBottomButton = null;

package/src/sap/m/p13n/Container.js

@@ -7,6 +7,7 @@ sap.ui.define([
 	"sap/m/p13n/AbstractContainer",
 	"sap/m/Bar",
 	"sap/m/Button",
+	"sap/m/Text",
 	"sap/m/List",
 	"sap/m/IconTabBar",
 	"sap/m/IconTabFilter",
@@ -14,7 +15,7 @@ sap.ui.define([
 	"sap/ui/Device",
 	"sap/m/library",
 	"sap/m/StandardListItem"
-], function (AbstractContainer, Bar, Button, List, IconTabBar, IconTabFilter, ContainerItem, Device, mLibrary, StandardListItem) {
+], function (AbstractContainer, Bar, Button, Text, List, IconTabBar, IconTabFilter, ContainerItem, Device, mLibrary, StandardListItem) {
 	"use strict";
 
 	// shortcut for sap.m.ButtonType
@@ -37,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.112.0
+	 * @version 1.113.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -80,6 +81,8 @@ sap.ui.define([
 		//clear existing navigation items
 		this._getTabBar().removeAllItems();
 		this._getNavigationList().removeAllItems();
+		var oBackButton;
+		var oHeaderText;
 		var oHeaderContent;
 
 		//update navigator control
@@ -87,7 +90,8 @@ sap.ui.define([
 			this._getTabBar().setVisible(false);
 			this._getNavigationList();
 			this.switchView(this.DEFAULT_KEY);
-			oHeaderContent = this._getNavBackBtn();
+			oBackButton = this._getNavBackBtn();
+			oHeaderText = this._getHeaderText();
 		} else {
 			this._getTabBar().setVisible(true);
 			var aViews = this.getViews();
@@ -101,12 +105,17 @@ sap.ui.define([
 		var oHeader = this.getHeader();
 		if (!oHeader) {
 			var oBar = new Bar({
-				contentLeft: [oHeaderContent]
+				contentLeft: oHeaderContent ? oHeaderContent : [oBackButton, oHeaderText]
 			});
 			this.setHeader(oBar);
 		} else {
 			oHeader.removeAllContentLeft();
-			oHeader.addContentLeft(oHeaderContent);
+			if (oHeaderContent) {
+				oHeader.addContentLeft(oHeaderContent);
+			} else {
+				oHeader.addContentLeft(oBackButton);
+				oHeader.addContentLeft(oHeaderText);
+			}
 		}
 
 		//recreate the navigation items
@@ -139,11 +148,12 @@ sap.ui.define([
 				});
 			}
 		}
-		this.oLayout.setShowHeader(sKey !== this.DEFAULT_KEY); //Don't show header in default view
-		this.oLayout.setShowFooter(sKey !== this.DEFAULT_KEY); //Don't show footer in default view
+		this.getLayout().setShowHeader(sKey !== this.DEFAULT_KEY); //Don't show header in default view
+		this.getLayout().setShowFooter(sKey !== this.DEFAULT_KEY); //Don't show footer in default view
 		this._getTabBar().setSelectedKey(sKey);
 		this._getNavBackBtn().setVisible(sKey !== this.DEFAULT_KEY);
-		this._getNavBackBtn().setText((this.getView(sKey) && this.getView(sKey).getText()) || sKey);
+		this._getHeaderText().setText((this.getView(sKey) && this.getView(sKey).getText()) || sKey);
+		this._getHeaderText().setVisible(this._getNavBackBtn().getVisible());
 	};
 
 	/**
@@ -182,6 +192,16 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * Returns the layout object.
+	 *
+	 * @returns {sap.m.Page} The layout object
+	 * @ui5-restricted sap.m.table.columnmenu.Menu
+	 */
+	Container.prototype.getLayout = function () {
+		return this.oLayout;
+	};
+
 	Container.prototype._getTabBar = function () {
 		if (!this._oTabBar) {
 			this._oTabBar = new IconTabBar({
@@ -230,6 +250,15 @@ sap.ui.define([
 		return this._oNavBackBtn;
 	};
 
+	Container.prototype._getHeaderText = function () {
+		if (!this._oHeaderText) {
+			this._oHeaderText = new Text({
+			});
+			this.addDependent(this._oHeaderText);
+		}
+		return this._oHeaderText;
+	};
+
 	Container.prototype._addToNavigator = function (oContainerItem) {
 
 		var sKey = oContainerItem.getKey(), oContainerItemTextBindingInfo = oContainerItem.getBindingInfo("text"), vText = oContainerItem.getText(), sIcon = oContainerItem.getIcon();
@@ -294,6 +323,7 @@ sap.ui.define([
 			this._oNavigationList = null;
 		}
 		this._oNavBackBtn = null;
+		this._oHeaderText = null;
 	};
 
 	return Container;