@openui5/sap.m 1.115.1 → 1.117.0

package/src/sap/m/TableRenderer.js

@@ -4,14 +4,12 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/InvisibleText", "./library", "./ListBaseRenderer", "./ColumnListItemRenderer"],
-	function(Renderer, Core, InvisibleText, library, ListBaseRenderer, ColumnListItemRenderer) {
+sap.ui.define(["sap/base/i18n/Localization", "sap/ui/core/Renderer", "sap/ui/core/InvisibleText", "./library", "./ListBaseRenderer", "./ColumnListItemRenderer", "sap/ui/core/Lib"],
+	function(Localization, Renderer, InvisibleText, library, ListBaseRenderer, ColumnListItemRenderer, Library) {
 	"use strict";
 
 
-	// shortcut for sap.m.ListKeyboardMode
 	var ListKeyboardMode = library.ListKeyboardMode;
-	// shortcut for sap.m.MultiSelectMode
 	var MultiSelectMode = library.MultiSelectMode;
 
 	/**
@@ -25,7 +23,7 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 	TableRenderer.apiVersion = 2;
 
 	// store the flex alignment for the column header based on the RTL mode
-	var bRtl = Core.getConfiguration().getRTL();
+	var bRtl = Localization.getRTL();
 	TableRenderer.columnAlign = {
 		left: bRtl ? "flex-end" : "flex-start",
 		center: "center",
@@ -38,187 +36,159 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 	 *
 	 * @param {sap.ui.core.RenderManager} rm RenderManager
 	 * @param {sap.m.ListBase} oTable Table control
-	 * @param {string} type Whether "Head" or "Foot"
+	 * @param {string} sType Whether "Head" or "Foot"
 	 */
-	TableRenderer.renderColumns = function(rm, oTable, type) {
-		var index = 0,
-			hiddens = 0,
-			hasPopin = false,
-			hasFooter = false,
-			mode = oTable.getMode(),
-			iModeOrder = ListBaseRenderer.ModeOrder[mode],
-			clsPrefix = "sapMListTbl",
-			idPrefix = oTable.getId("tbl"),
-			cellTag = (type == "Head") ? "th" : "td",
-			groupTag = "t" + type.toLowerCase(),
+	TableRenderer.renderColumns = function(rm, oTable, sType) {
+		var iIndex = 0,
+			bHasPopin = false,
+			bHasFooter = false,
+			bHeaderHidden = false,
+			bHasFlexibleColumn,
+			sMode = oTable.getMode(),
+			iModeOrder = ListBaseRenderer.ModeOrder[sMode],
+			sClassPrefix = "sapMListTbl",
+			sIdPrefix = oTable.getId("tbl"),
+			sCellTag = (sType == "Head") ? "th" : "td",
+			sTypeTag = "t" + sType.toLowerCase(),
 			aColumns = oTable.getColumns(),
-			bShouldRenderDummyColumn = oTable.shouldRenderDummyColumn(),
-			bHeaderHidden,
-			createBlankCell = function(cls, id, bAriaHidden) {
-				rm.openStart(cellTag, id && idPrefix + id);
-				if (cellTag === "th") {
+			vFixedLayout = oTable.getFixedLayout(),
+			createBlankCell = function(sClass, sId, bAriaHidden) {
+				rm.openStart(sCellTag, sId && sIdPrefix + sId);
+				if (sCellTag === "th") {
 					rm.class("sapMTableTH");
 					rm.attr("role", bAriaHidden ? "presentation" : "columnheader");
 					rm.attr("scope", "col");
-				} else if (bAriaHidden) { // hidden td
+				} else if (bAriaHidden) {
 					rm.attr("role", "presentation");
 				}
 				bAriaHidden && rm.attr("aria-hidden", "true");
-				rm.class(clsPrefix + cls);
-
-				if (type === "Foot") {
-					if (cls === "HighlightCol") {
-						rm.class("sapMTableHighlightFooterCell");
-					} else if (cls === "NavigatedCol") {
-						rm.class("sapMTableNavigatedFooterCell");
-					}
-				}
-
+				rm.class(sClassPrefix + sClass);
 				rm.openEnd();
-				rm.close(cellTag);
-				index++;
+				rm.close(sCellTag);
+				iIndex++;
 			};
 
-		if (type == "Head") {
-			var aVisibleColumns = aColumns.filter(function(oCol){
-				return oCol.getVisible();
+		if (sType == "Head") {
+			var oFirstVisibleColumn = aColumns.find(function(oColumn) {
+				return oColumn.getVisible();
 			});
 			var oForcedColumn = aColumns.reduce(function(oRefColumn, oColumn, iOrder) {
 				oColumn.setIndex(-1);
 				oColumn.setInitialOrder(iOrder);
 				oColumn.setForcedColumn(false);
 				return (oColumn.getVisible() && oColumn.getCalculatedMinScreenWidth() < oRefColumn.getCalculatedMinScreenWidth()) ? oColumn : oRefColumn;
-			}, aVisibleColumns[0]);
+			}, oFirstVisibleColumn);
 
-			var iHeaderLength = aColumns.filter(function(oColumn) {
-				return	oColumn.getVisible() &&
-						!oColumn.isPopin() &&
-						!oColumn.isHidden();
+			var iRenderedColumnsLength = aColumns.filter(function(oColumn) {
+				return oColumn.getVisible() && !oColumn.isHidden();
 			}).length;
-
-			if (!iHeaderLength && oForcedColumn) {
+			if (!iRenderedColumnsLength && oForcedColumn) {
 				oForcedColumn.setForcedColumn(true);
-				iHeaderLength = 1;
+				iRenderedColumnsLength = 1;
+			}
+			if (iRenderedColumnsLength == 1 && vFixedLayout == "Strict") {
+				oTable._bCheckLastColumnWidth = true;
 			}
 
-			bHeaderHidden = aColumns.every(function(oColumn) {
-				return	!oColumn.getHeader() ||
-						!oColumn.getHeader().getVisible() ||
-						!oColumn.getVisible() ||
-						oColumn.isPopin() ||
-						oColumn.isHidden();
+			bHeaderHidden = !iRenderedColumnsLength || aColumns.every(function(oColumn) {
+				return !oColumn.getHeader() || !oColumn.getHeader().getVisible() || !oColumn.getVisible() || oColumn.isHidden();
 			});
 		}
 
-		rm.openStart(groupTag);
-
-		if (oTable._hasFooter && type === "Foot") {
+		rm.openStart(sTypeTag);
+		if (oTable._hasFooter && sType === "Foot") {
 			rm.class("sapMTableTFoot");
-
 			if (oTable.hasPopin()) {
 				rm.class("sapMListTblHasPopin");
 			}
 		}
-
 		rm.openEnd();
 
-		rm.openStart("tr", oTable.addNavSection(idPrefix + type + "er"));
-
+		rm.openStart("tr", oTable.addNavSection(sIdPrefix + sType + "er"));
 		if (bHeaderHidden) {
 			rm.class("sapMListTblHeaderNone");
+			rm.attr("aria-hidden", true);
 		} else {
 			rm.attr("tabindex", -1);
-			rm.class("sapMListTblRow").class("sapMListTbl" + type + "er");
+			rm.class("sapMListTblRow").class("sapMListTbl" + sType + "er");
 			rm.class("sapMLIBFocusable").class("sapMTableRowCustomFocus");
 		}
-
 		rm.openEnd();
 
-		createBlankCell("HighlightCol", type + "Highlight", true);
+		createBlankCell("HighlightCol", sType + "Highlight", true);
 
 		if (iModeOrder == -1) {
-			if (mode == "MultiSelect" && type == "Head" && !bHeaderHidden) {
+			if (sMode == "MultiSelect" && sType == "Head" && !bHeaderHidden) {
 				rm.openStart("th");
 				rm.class("sapMTableTH");
 				rm.attr("scope", "col");
 				rm.attr("aria-hidden", "true");
-				rm.class(clsPrefix + "SelCol");
+				rm.class(sClassPrefix + "SelCol");
 				rm.attr("role", "presentation");
 				rm.openEnd();
 				rm.renderControl(oTable.getMultiSelectMode() == MultiSelectMode.ClearAll ? oTable._getClearAllButton() : oTable._getSelectAllCheckbox());
 				rm.close("th");
-				index++;
+				iIndex++;
 			} else {
 				createBlankCell("SelCol", "", true);
 			}
 		}
 
-		oTable.getColumns(true).forEach(function(oColumn, order) {
+		oTable.getColumns(true).forEach(function(oColumn) {
 			if (!oColumn.getVisible()) {
 				return;
 			}
 			if (oColumn.isPopin()) {
-				hasPopin = true;
+				bHasPopin = true;
 				return;
 			}
-			var bHidden = oColumn.isHidden();
-			if (bHidden) {
-				hiddens++;
+			if (oColumn.isHidden()) {
+				return;
 			}
 
-			var control = oColumn["get" + type + "er"](),
-				vFixedLayout = oTable.getFixedLayout(),
-				width = (iHeaderLength == 1 && vFixedLayout != "Strict") ? "" : oColumn.getWidth(),
-				aStyleClass = oColumn.getStyleClass(true).split(" "),
-				align = oColumn.getCssAlign();
-
-			oTable._bCheckLastColumnWidth = vFixedLayout == "Strict" && iHeaderLength == 1;
+			var oControl = oColumn["get" + sType + "er"](),
+				sWidth = (iRenderedColumnsLength == 1 && vFixedLayout != "Strict") ? "" : oColumn.getWidth(),
+				aStyleClass = oColumn.getStyleClass().split(" ").filter(Boolean),
+				sAlign = oColumn.getCssAlign();
 
-			if (type == "Head") {
-				rm.openStart(cellTag, oColumn);
+			if (sType == "Head") {
+				rm.openStart(sCellTag, oColumn);
 				rm.class("sapMTableTH");
 				rm.attr("role", "columnheader");
 				rm.attr("scope", "col");
 				var sSortIndicator = oColumn.getSortIndicator().toLowerCase();
 				sSortIndicator !== "none" && rm.attr("aria-sort", sSortIndicator);
+				if (!bHasFlexibleColumn) {
+					bHasFlexibleColumn = !sWidth || sWidth == "auto";
+				}
 			} else {
-				rm.openStart(cellTag);
+				rm.openStart(sCellTag);
 			}
 
-			aStyleClass && aStyleClass.forEach(function (sClsName) {
-				rm.class(sClsName);
+			aStyleClass.forEach(function (sClass) {
+				rm.class(sClass);
 			});
-			rm.class(clsPrefix + "Cell");
-			rm.class(clsPrefix + type + "erCell");
+			rm.class(sClassPrefix + "Cell");
+			rm.class(sClassPrefix + sType + "erCell");
 			rm.attr("data-sap-ui-column", oColumn.getId());
-			rm.attr("data-sap-width", oColumn.getWidth());
-			rm.style("width", width);
-
-			// required to set the correct aligment to the footer cell
-			if (align && type !== "Head") {
-				rm.style("text-align", align);
+			rm.style("width", sWidth);
+			if (sAlign && sType !== "Head") {
+				rm.style("text-align", sAlign);
 			}
-
-			if (bHidden) {
-				rm.style("display", "none");
-				rm.attr("aria-hidden", "true");
-			}
-
 			rm.openEnd();
 
-			if (control) {
-				if (type === "Head") {
+			if (oControl) {
+				if (sType === "Head") {
 					rm.openStart("div", oColumn.getId() + "-ah");
 					rm.class("sapMColumnHeader");
 
 					var oMenu = oColumn._getHeaderMenuInstance();
-					if ((oTable.bActiveHeaders || oMenu)  && !control.isA("sap.ui.core.InvisibleText")) {
-						// add active header attributes and style class
+					if ((oTable.bActiveHeaders || oMenu)  && !oControl.isA("sap.ui.core.InvisibleText")) {
 						rm.attr("tabindex", 0);
 						rm.attr("role", "button");
 						rm.class("sapMColumnHeaderActive");
 						rm.attr("aria-haspopup", oMenu ? oMenu.getAriaHasPopupType().toLowerCase() : "dialog");
-						if (control.isA("sap.m.Label") && control.getRequired()) {
+						if (oControl.isA("sap.m.Label") && oControl.getRequired()) {
 							rm.attr("aria-describedby", InvisibleText.getStaticId("sap.m", "CONTROL_IN_COLUMN_REQUIRED"));
 						}
 					} else if (oTable.bFocusableHeaders) {
@@ -226,51 +196,54 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 						rm.class("sapMColumnHeaderFocusable");
 					}
 
-					if (align) {
-						rm.style("justify-content", TableRenderer.columnAlign[align]);
-						rm.style("text-align", align);
+					if (sAlign) {
+						rm.style("justify-content", TableRenderer.columnAlign[sAlign]);
+						rm.style("text-align", sAlign);
 					}
 
 					rm.openEnd();
-					rm.renderControl(control.addStyleClass("sapMColumnHeaderContent"));
+					rm.renderControl(oControl.addStyleClass("sapMColumnHeaderContent"));
 					rm.close("div");
 				} else {
-					// rendering of the footer cell
-					rm.renderControl(control);
+					rm.renderControl(oControl);
 				}
 			}
 
-			if (type == "Head" && !hasFooter) {
-				hasFooter = !!oColumn.getFooter();
+			if (sType == "Head" && !bHasFooter) {
+				bHasFooter = !!oColumn.getFooter();
 			}
 
-			rm.close(cellTag);
-			oColumn.setIndex(index++);
+			rm.close(sCellTag);
+			oColumn.setIndex(iIndex++);
 		});
 
-		if (hasPopin && bShouldRenderDummyColumn) {
-			createBlankCell("DummyCell", type + "DummyCell", true);
+		if (sType == "Head") {
+			oTable._dummyColumn = (bHasFlexibleColumn != undefined && !bHasFlexibleColumn && vFixedLayout == "Strict");
 		}
 
-		createBlankCell("NavCol", type + "Nav", true);
+		if (bHasPopin && oTable._dummyColumn) {
+			createBlankCell("DummyCell", sType + "DummyCell", true);
+		}
+
+		createBlankCell("NavCol", sType + "Nav", true);
 
 		if (iModeOrder == 1) {
 			createBlankCell("SelCol", "", true);
 		}
 
-		createBlankCell("NavigatedCol", type + "Navigated", true);
+		createBlankCell("NavigatedCol", sType + "Navigated", true);
 
-		if (!hasPopin && bShouldRenderDummyColumn) {
-			createBlankCell("DummyCell", type + "DummyCell", true);
+		if (!bHasPopin && oTable._dummyColumn) {
+			createBlankCell("DummyCell", sType + "DummyCell", true);
 		}
 
 		rm.close("tr");
-		rm.close(groupTag);
+		rm.close(sTypeTag);
 
-		if (type === "Head") {
-			oTable._hasPopin = hasPopin;
-			oTable._colCount = index - hiddens;
-			oTable._hasFooter = hasFooter;
+		if (sType === "Head") {
+			oTable._colCount = iIndex;
+			oTable._hasPopin = bHasPopin;
+			oTable._hasFooter = bHasFooter;
 			oTable._headerHidden = bHeaderHidden;
 		}
 	};
@@ -280,7 +253,7 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 	 */
 	TableRenderer.renderContainerAttributes = function(rm, oControl) {
 		rm.attr("role", "application").attr("data-sap-ui-pasteregion", "true");
-		rm.attr("aria-roledescription", Core.getLibraryResourceBundle("sap.m").getText("TABLE_CONTAINER_ROLE_DESCRIPTION"));
+		rm.attr("aria-roledescription", Library.getResourceBundleFor("sap.m").getText("TABLE_CONTAINER_ROLE_DESCRIPTION"));
 		rm.class("sapMListTblCnt");
 
 		// write accessibility state for the table container
@@ -371,8 +344,7 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 		}
 		rm.openEnd();
 
-		var bRenderDummyColumn = !oControl.hasPopin() && oControl.shouldRenderDummyColumn();
-
+		var bRenderDummyColumn = oControl.shouldRenderDummyColumn();
 		rm.openStart("td", oControl.getId("nodata-text"));
 		rm.attr("colspan", oControl.getColCount() - bRenderDummyColumn);
 		rm.class("sapMListTblCell").class("sapMListTblCellNoData");
@@ -383,7 +355,7 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 				// If _noColumnsMessage is set, there is for sure an IllustratedMessage used for no data visualization
 				rm.renderControl(oControl.getAggregation("_noColumnsMessage"));
 			} else {
-				rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));
+				rm.text(Library.getResourceBundleFor("sap.m").getText("TABLE_NO_COLUMNS"));
 			}
 		} else {
 			this.renderNoDataArea(rm, oControl);

package/src/sap/m/TableSelectDialog.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * When using the <code>sap.m.TableSelectDialog</code> in SAP Quartz and Horizon themes, the breakpoints and layout paddings could be determined by the dialog's width. To enable this concept and add responsive paddings to an element of the control, you have to add the following classes depending on your use case: <code>sapUiResponsivePadding--header</code>, <code>sapUiResponsivePadding--subHeader</code>, <code>sapUiResponsivePadding--content</code>, <code>sapUiResponsivePadding--footer</code>.
 	 * @extends sap.m.SelectDialogBase
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Text.js

@@ -54,7 +54,7 @@ function(library, Core, Control, coreLibrary, Device, HyphenationSupport, TextRe
 	 * @implements sap.ui.core.IShrinkable, sap.ui.core.IFormContent, sap.ui.core.ISemanticFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TextArea.js

@@ -84,7 +84,7 @@ function(
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TextRenderer.js

@@ -10,13 +10,13 @@ sap.ui.define([
 	'sap/ui/core/library',
 	'sap/m/HyphenationSupport',
 	'./library',
-	'sap/ui/core/Core'
+	"sap/ui/core/Lib"
 ], function(
 	Renderer,
 	coreLibrary,
 	HyphenationSupport,
 	mobileLibrary,
-	Core
+	Library
 ) {
 		"use strict";
 
@@ -30,7 +30,7 @@ sap.ui.define([
 		var EmptyIndicatorMode = mobileLibrary.EmptyIndicatorMode;
 
 		// shortcut for library resource bundle
-		var oRb = Core.getLibraryResourceBundle("sap.m");
+		var oRb = Library.getResourceBundleFor("sap.m");
 
 		/**
 		 * Text renderer.

package/src/sap/m/Tile.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TileContainer.js

@@ -46,7 +46,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TileContent.js

@@ -24,7 +24,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @since 1.34.0
 	 *
 	 * @public

package/src/sap/m/TileRenderer.js

@@ -5,11 +5,12 @@
  */
 
 // Provides default renderer for control sap.m.Text
-sap.ui.define([],
-	function() {
+sap.ui.define([
+	"sap/ui/core/Core"
+],
+	function(Core) {
 	"use strict";
 
-
 	/**
 	 * Text renderer.
 	 * @author SAP SE
@@ -25,7 +26,8 @@ sap.ui.define([],
 	 * @param {sap.m.Tile} oControl An object representation of the control that should be rendered
 	 */
 	TileRenderer.render = function(rm, oControl) {
-		var oTileContainer,
+		var oRB = Core.getLibraryResourceBundle("sap.m"),
+			oTileContainer,
 			aVisibleTiles;
 
 		rm.openStart("div", oControl);
@@ -55,6 +57,7 @@ sap.ui.define([],
 		rm.openEnd();
 		rm.openStart("div", oControl.getId() + "-remove");
 		rm.class(oControl.getRemovable() ? "sapMTCRemove" : "sapMTCNoRemove");
+		rm.attr("title", oRB.getText("GENERICTILE_REMOVEBUTTON_TEXT"));
 		rm.openEnd().close("div");
 		rm.openStart("div").class("sapMTileContent").openEnd();
 		this._renderContent(rm, oControl);

package/src/sap/m/TimePicker.js

@@ -31,7 +31,8 @@ sap.ui.define([
 	'./Button',
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Configuration",
-	"sap/ui/core/date/UI5Date"
+	"sap/ui/core/date/UI5Date",
+	"sap/ui/core/Core"
 ],
 function(
 	InputBase,
@@ -59,7 +60,8 @@ function(
 	Button,
 	jQuery,
 	Configuration,
-	UI5Date
+	UI5Date,
+	Core
 ) {
 		"use strict";
 
@@ -174,7 +176,7 @@ function(
 		 * @extends sap.m.DateTimeField
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 *
 		 * @constructor
 		 * @public
@@ -444,7 +446,7 @@ function(
 				id: this.getId() + "-icon",
 				src: this.getIconSrc(),
 				noTabStop: true,
-				decorative: false,
+				decorative: !Device.support.touch || Device.system.desktop ? true : false,
 				useIconTooltip: false,
 				alt: this._oResourceBundle.getText("OPEN_PICKER_TEXT")
 			});
@@ -1256,6 +1258,31 @@ function(
 			oEvent.preventDefault(); // do not move cursor
 		};
 
+		/**
+		 * Handle when escape is pressed. Escaping unsaved input will restore
+		 * the last valid value. If the value cannot be parsed into a date,
+		 * the input will be cleared.
+		 *
+		 * @param {jQuery.Event} oEvent The event object.
+		 * @private
+		 */
+		TimePicker.prototype.onsapescape = function(oEvent) {
+			var oLastDate = this._parseValue(this.getLastValue(), true),
+				oInputDate = this._parseValue(this._getInputValue(), true),
+				sDisplayFormatLastDate = this._formatValue(oLastDate, false),
+				sDisplayFormatInputDate = this._formatValue(oInputDate, false),
+				sInputValue = this.getMaskMode() === "Off" ? this._getInputValue() : sDisplayFormatInputDate;
+
+			if (sInputValue !== sDisplayFormatLastDate) {
+				oEvent.setMarked();
+				oEvent.preventDefault();
+
+				this.updateDomValue(sDisplayFormatLastDate);
+				this.onValueRevertedByEscape(sDisplayFormatLastDate, sDisplayFormatInputDate);
+			}
+			this._bCheckForLiveChange = true;
+		};
+
 		/**
 		 * Handles the shift + pagedown and ctrl + shift + pagedown events.
 		 *
@@ -1304,7 +1331,9 @@ function(
 
 				oEvent.preventDefault(); //ie expands the address bar on F4
 			} else if (!this._isMobileDevice()) {
-				MaskEnabler.onkeydown.call(this, oEvent);
+				if (iKC !== oKC.ESCAPE) {
+					MaskEnabler.onkeydown.call(this, oEvent);
+				}
 			} else {
 				if (iKC === KeyCodes.ENTER || iKC === KeyCodes.SPACE) {
 					this._openNumericPicker();
@@ -2275,6 +2304,8 @@ function(
 			var oRenderer = this.getRenderer();
 			var oInfo = DateTimeField.prototype.getAccessibilityInfo.apply(this, arguments);
 			var sValue = this.getValue() || "";
+			var sRequired = this.getRequired() ? Core.getLibraryResourceBundle("sap.m").getText("ELEMENT_REQUIRED") : '';
+
 			if (this._bValid) {
 				var oDate = this.getDateValue();
 				if (oDate) {
@@ -2282,13 +2313,11 @@ function(
 				}
 			}
 
-			jQuery.extend(true, oInfo, {
-				role: oRenderer.getAriaRole(this),
-				type: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_TIMEINPUT"),
-				description: [sValue, oRenderer.getLabelledByAnnouncement(this), oRenderer.getDescribedByAnnouncement(this)].join(" ").trim(),
-				autocomplete: "none",
-				haspopup: true
-			});
+			oInfo.role = oRenderer.getAriaRole(this);
+			oInfo.type = Core.getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_TIMEINPUT");
+			oInfo.description = [sValue || this._getPlaceholder(), oRenderer.getDescribedByAnnouncement(this), sRequired].join(" ").trim();
+			oInfo.autocomplete = "none";
+			oInfo.haspopup = true;
 
 			return oInfo;
 		};

package/src/sap/m/TimePickerClock.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/TimePickerClocks.js

@@ -52,7 +52,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.115.1
+		 * @version 1.117.0
 		 *
 		 * @constructor
 		 * @public