@openui5/sap.m 1.99.1 → 1.102.0

package/src/sap/m/TableRenderer.js

@@ -4,8 +4,8 @@
  * 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/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/InvisibleText", "./library", "./ListBaseRenderer", "./ColumnListItemRenderer", "sap/m/table/Util"],
+	function(Renderer, Core, InvisibleText, library, ListBaseRenderer, ColumnListItemRenderer, Util) {
 	"use strict";
 
 
@@ -355,9 +355,14 @@ sap.ui.define(["sap/ui/core/Renderer", "sap/ui/core/Core", "sap/ui/core/Invisibl
 		rm.openEnd();
 
 		if (!oControl.shouldRenderItems()) {
-			rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));
+			var vNoData = oControl.getNoData();
+			if (vNoData && typeof vNoData !== "string" && vNoData.isA("sap.m.IllustratedMessage")) {
+				rm.renderControl(oControl.getAggregation("_noColumnsMessage"));
+			} else {
+				rm.text(Core.getLibraryResourceBundle("sap.m").getText("TABLE_NO_COLUMNS"));
+			}
 		} else {
-			rm.text(oControl.getNoDataText(true));
+			this.renderNoDataArea(rm, oControl);
 		}
 
 		rm.close("td");

package/src/sap/m/TableSelectDialog.js

@@ -11,8 +11,10 @@ sap.ui.define([
 	'./SearchField',
 	'./Table',
 	'./library',
+	"sap/ui/core/library",
 	'./SelectDialogBase',
 	'sap/ui/core/InvisibleText',
+	"sap/ui/core/InvisibleMessage",
 	'sap/ui/Device',
 	'sap/m/Toolbar',
 	'sap/m/Text',
@@ -26,8 +28,10 @@ sap.ui.define([
 	SearchField,
 	Table,
 	library,
+	CoreLibrary,
 	SelectDialogBase,
 	InvisibleText,
+	InvisibleMessage,
 	Device,
 	Toolbar,
 	Text,
@@ -47,6 +51,9 @@ sap.ui.define([
 	// shortcut for sap.m.TitleAlignment
 	var TitleAlignment = library.TitleAlignment;
 
+	// shortcut for sap.ui.core.InvisibleMessageMode
+	var InvisibleMessageMode = CoreLibrary.InvisibleMessageMode;
+
 	/**
 	 * Constructor for a new TableSelectDialog.
 	 *
@@ -95,10 +102,10 @@ sap.ui.define([
 	 * <ul>
 	 * <li>On smaller screens, the columns of the table wrap and build a list that shows all the information.</li>
 	 * </ul>
-	 * When using the <code>sap.m.TableSelectDialog</code> in SAP Quartz 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>.
+	 * 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.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -370,13 +377,6 @@ sap.ui.define([
 			updateFinished: this._updateFinished.bind(this)
 		});
 
-
-		this._oTable.getInfoToolbar().addEventDelegate({
-			onAfterRendering: function () {
-				that._oTable.getInfoToolbar().$().attr('aria-live', 'polite');
-			}
-		});
-
 		this._table = this._oTable; // for downward compatibility
 
 		// store a reference to the busyIndicator to display when data is currently loaded by a service
@@ -1034,7 +1034,7 @@ sap.ui.define([
 	TableSelectDialog.prototype._updateStarted = function (oEvent) {
 		this.fireUpdateStarted(oEvent.getParameters());
 
-		if (this.getModel() && this.getModel() instanceof sap.ui.model.odata.ODataModel) {
+		if (this.getModel() && this.getModel().isA("sap.ui.model.odata.ODataModel")) {
 			if (this._oDialog.isOpen() && this._iTableUpdateRequested) {
 				// only set busy mode when we have an OData model
 				this._setBusy(true);
@@ -1055,7 +1055,7 @@ sap.ui.define([
 
 		this._updateSelectionIndicator();
 		// only reset busy mode when we have an OData model
-		if (this.getModel() && this.getModel() instanceof sap.ui.model.odata.ODataModel) {
+		if (this.getModel() && this.getModel().isA("sap.ui.model.odata.ODataModel")) {
 			this._setBusy(false);
 			this._bInitBusy = false;
 		}
@@ -1183,6 +1183,10 @@ sap.ui.define([
 		// update the selection label
 		oInfoBar.setVisible(!!iSelectedContexts);
 		oInfoBar.getContent()[0].setText(this._oRb.getText("TABLESELECTDIALOG_SELECTEDITEMS", [iSelectedContexts]));
+
+		if (this._oDialog.isOpen()) {
+			InvisibleMessage.getInstance().announce(iSelectedContexts > 0 ? this._oRb.getText("TABLESELECTDIALOG_SELECTEDITEMS_SR", [iSelectedContexts]) : "", InvisibleMessageMode.Polite);
+		}
 	};
 
 	/**

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.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/TextArea.js

@@ -82,7 +82,7 @@ function(
 	 * @extends sap.m.InputBase
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Tile.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -89,7 +89,7 @@ sap.ui.define([
 	 * @private
 	 */
 	Tile.prototype.onAfterRendering = function(){
-		if (this._rendered && !this._bIsDragged && this.getParent() instanceof sap.m.TileContainer) {
+		if (this._rendered && !this._bIsDragged && this.getParent() && this.getParent().isA("sap.m.TileContainer")) {
 			this.setPos(this._posX,this._posY);
 		}
 		this._rendered = true;
@@ -249,7 +249,7 @@ sap.ui.define([
 		if (!bVisible) {
 			this._rendered = false;
 		}
-		if (this.getParent() && this.getParent() instanceof sap.m.TileContainer) {
+		if (this.getParent() && this.getParent().isA("sap.m.TileContainer")) {
 			this.getParent().invalidate(); // Force rerendering of TileContainer, so the tiles can be rearanged
 		}
 		return this;

package/src/sap/m/TileContainer.js

@@ -8,6 +8,7 @@
 sap.ui.define([
 	'./library',
 	'sap/ui/core/Control',
+	'sap/ui/core/Core',
 	'sap/ui/core/IconPool',
 	'sap/ui/Device',
 	'sap/ui/core/ResizeHandler',
@@ -22,6 +23,7 @@ sap.ui.define([
 function(
 	library,
 	Control,
+	oCore,
 	IconPool,
 	Device,
 	ResizeHandler,
@@ -44,7 +46,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @constructor
 	 * @public
@@ -419,7 +421,7 @@ function(
 		}
 		this._oTileDimensionCalculator = new TileDimensionCalculator(this);
 
-		this._bRtl = sap.ui.getCore().getConfiguration().getRTL();
+		this._bRtl = oCore.getConfiguration().getRTL();
 		//Keeps info about the current page and total page count. In addition the old(previous) values of the same are kept.
 		this._oPagesInfo = (function (bRightToLeftMode) {
 			var iCurrentPage, iCount,
@@ -1988,7 +1990,7 @@ function(
 	 * @private
 	 */
 	TileContainer.prototype._renderTile = function(oTile, iIndex) {
-		var oRm = sap.ui.getCore().createRenderManager(),
+		var oRm = oCore.createRenderManager(),
 			oContent = this.$("cnt")[0];
 
 		oRm.renderControl(oTile);
@@ -2005,7 +2007,7 @@ function(
 
 	/**
 	 * Calculates the dimension of TileContainer root DOM element.
-	 * @return {{width, height: *, outerheight: *, outerwidth: *}}
+	 * @return {{width: any, height: any, outerheight: any, outerwidth: any}}
 	 * @private
 	 */
 	TileContainer.prototype._calculateDimension = function(){

package/src/sap/m/TileContent.js

@@ -10,6 +10,8 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 
 	var Priority = Core.Priority;
 
+	var LoadState = library.LoadState;
+
 	/**
 	 * Constructor for a new sap.m.TileContent control.
 	 *
@@ -20,7 +22,7 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -61,7 +63,12 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 				 * Adds a priority badge before the content. Works only in Generic Tile ActionMode.
 				 * @experimental Since 1.96
 				 */
-				"priority" : {type: "sap.ui.core.Priority", group: "Misc", defaultValue: Priority.None}
+				"priority" : {type: "sap.ui.core.Priority", group: "Misc", defaultValue: Priority.None},
+				/**
+				 * The load status.
+				 * @since 1.100.0
+				 */
+				"state": {type: "sap.m.LoadState", group: "Misc", defaultValue: LoadState.Loaded}
 			},
 			defaultAggregation : "content",
 			aggregations : {
@@ -78,9 +85,34 @@ sap.ui.define(['./library', 'sap/ui/core/library', 'sap/ui/core/Control', './Til
 	TileContent.prototype.init = function() {
 		this._bRenderFooter = true;
 		this._bRenderContent = true;
+		this._bStateSetManually = false;
 	};
 
 	TileContent.prototype.onBeforeRendering = function() {
+		var sState = this.mProperties.hasOwnProperty("state");
+		if (sState && !this._bStateSetManually) {
+			if (this.getParent() && this.getParent().isA("sap.m.GenericTile")) {
+				if (this.getParent().getState() === LoadState.Failed) {
+					this.setProperty("state", LoadState.Loaded, true);
+				} else if (this.getParent().getState() === LoadState.Disabled) {
+					this.setProperty("state", LoadState.Loaded, true);
+					this.setProperty("disabled", this.getState() === LoadState.Disabled, true);
+				}
+			}
+		} else {
+			if (this.getParent() && this.getParent().isA("sap.m.GenericTile")) {
+				if (this.getParent().getState() === LoadState.Failed) {
+					this.setProperty("state", LoadState.Loaded, true);
+				} else if (this.getParent().getState() === LoadState.Disabled) {
+					this.setProperty("state", LoadState.Loaded, true);
+					this.setProperty("disabled", this.getState() === LoadState.Disabled, true);
+				} else {
+					this.setProperty("state", this.getParent().getState(), true);
+				}
+			}
+			this._bStateSetManually = true;
+		}
+
 		if (this.getContent() && this._oDelegate) {
 			if (this.getDisabled()) {
 				this.getContent().addDelegate(this._oDelegate);

package/src/sap/m/TileContentRenderer.js

@@ -36,15 +36,52 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 		var sFrameTypeClass = encodeCSS("sapMFrameType" + oControl.getFrameType());
 
 		oRm.openStart("div", oControl);
-		oRm.class("sapMTileCnt");
+		oRm.class(oControl.getState() == "Disabled" ? "sapMTileCnt sapMTileCntDisabled" : "sapMTileCnt");
 		oRm.class(sContentTypeClass);
 		oRm.class(sFrameTypeClass);
 		if (sTooltip.trim()) { // trim check needed since IE11 renders white spaces
 			oRm.attr("title", sTooltip);
 		}
 		oRm.openEnd();
-		this._renderContent(oRm, oControl);
-		this._renderFooter(oRm, oControl);
+		if (oControl.getState() == "Loading") {
+			oRm.openStart("div").class("sapMTileCntContentShimmerPlaceholderItem");
+			oRm.class("sapMTileCntContentShimmerPlaceholderWithDescription");
+			oRm.openEnd();
+			oRm.openStart("div").class("sapMTileCntContentShimmerPlaceholderRows")
+			.openEnd();
+			if (!(oControl.getParent().getFrameType() === "TwoByHalf" || oControl.getParent().getFrameType() === "OneByHalf")) {
+				oRm.openStart("div")
+				.class("sapMTileCntContentShimmerPlaceholderItemBox")
+				.class("sapMTileCntLoadingShimmer")
+				.openEnd()
+				.close("div");
+			}
+			oRm.openStart("div")
+			.class("sapMTileCntContentShimmerPlaceholderItemTextFooter")
+			.class("sapMTileCntLoadingShimmer")
+			.openEnd()
+			.close("div");
+			oRm.close("div");
+			oRm.close("div");
+		} else if (oControl.getState() == "Failed"){
+			oRm.openStart("div", oControl.getId() + "-failed-ftr");
+			oRm.class("sapMTileCntFtrFld");
+			oRm.openEnd();
+			oRm.openStart("div", oControl.getId() + "-failed-icon");
+			oRm.class("sapMTileCntFtrFldIcn");
+			oRm.openEnd();
+			oRm.renderControl(oControl.getParent()._oWarningIcon);
+			oRm.close("div");
+			oRm.openStart("div", oControl.getId() + "-failed-text");
+			oRm.class("sapMTileCntFtrFldTxt");
+			oRm.openEnd();
+			oRm.renderControl(oControl.getParent().getAggregation("_failedMessageText"));
+			oRm.close("div");
+			oRm.close("div");
+		} else {
+			this._renderContent(oRm, oControl);
+			this._renderFooter(oRm, oControl);
+		}
 
 		oRm.close("div");
 	};
@@ -65,7 +102,8 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 			oPriority = oControl.getPriority(),
 			oTile = oControl.getParent(),
 			bIsActionMode = oTile instanceof GenericTile && oTile.getMode() === GenericTileMode.ActionMode && oTile.getFrameType() === FrameType.TwoByOne,
-			bRenderPriority = bIsActionMode && oPriority && oPriority !== Priority.None;
+			bRenderPriority = bIsActionMode && oPriority && oPriority !== Priority.None,
+			sPriority = sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("TEXT_CONTENT_PRIORITY");
 
 		if (oContent) {
 			if (bRenderPriority) {
@@ -90,10 +128,11 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 				oRm.openStart("span", oControl.getId() + "-priority-value");
 				oRm.class("sapMTilePriorityValue");
 				oRm.openEnd();
-				oRm.text(oControl._getPriorityText(oPriority));
+				oRm.text(sPriority + ":" + " " + oControl._getPriorityText(oPriority));
 				oRm.close("span");
 				oRm.close("div");
 				oRm.close("div");
+				oRm.close("div");
 			}
 
 			oRm.openStart("div", oControl.getId() + "-content");
@@ -105,9 +144,6 @@ sap.ui.define(["./library", "sap/base/security/encodeCSS", "sap/m/GenericTile",
 			oRm.renderControl(oContent);
 			oRm.close("div");
 
-			if (bRenderPriority) {
-				oRm.close("div");
-			}
 		}
 	};
 

package/src/sap/m/TileRenderer.js

@@ -41,7 +41,7 @@ sap.ui.define([],
 		}
 
 		/* WAI ARIA if in TileContainer context */
-		if (oControl.getParent() instanceof sap.m.TileContainer) {
+		if (oControl.getParent() && oControl.getParent().isA("sap.m.TileContainer")) {
 			oTileContainer = oControl.getParent();
 			aVisibleTiles = oTileContainer._getVisibleTiles();
 

package/src/sap/m/TimePicker.js

@@ -21,6 +21,7 @@ sap.ui.define([
 	'./MaskEnabler',
 	'sap/ui/Device',
 	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/TimezoneUtil',
 	'sap/ui/core/Locale',
 	'sap/m/library',
 	'sap/ui/core/LocaleData',
@@ -47,6 +48,7 @@ function(
 	MaskEnabler,
 	Device,
 	DateFormat,
+	TimezoneUtil,
 	Locale,
 	library,
 	LocaleData,
@@ -140,7 +142,7 @@ function(
 		 * @extends sap.m.DateTimeField
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public
@@ -273,7 +275,23 @@ function(
 					 * Internal aggregation that contains the inner numeric _picker pop-up.
 					 */
 					 _numPicker: { type: "sap.m.Popover", multiple: false, visibility: "hidden" }
-					},
+				},
+				events: {
+
+					/**
+					 * Fired when <code>value help</code> dialog opens.
+					 * @since 1.102.0
+					 */
+					afterValueHelpOpen: {},
+
+					/**
+					 * Fired when <code>value help</code> dialog closes.
+					 * @since 1.102.0
+					 */
+					afterValueHelpClose: {}
+
+				},
+
 				dnd: { draggable: false, droppable: true }
 		}});
 
@@ -505,6 +523,7 @@ function(
 				bOpen = oNumericPicker && oNumericPicker.isOpen();
 
 			if (!this._isMobileDevice()) {
+				DateTimeField.prototype.onfocusin.apply(this, arguments);
 				MaskEnabler.onfocusin.apply(this, arguments);
 			}
 			if (oPicker && oPicker.isOpen() && !bIconClicked) {
@@ -568,18 +587,25 @@ function(
 			/* Set the timevalues of the picker here to prevent user from seeing it */
 			var oClocks = this._getClocks(),
 				oDateValue = this.getDateValue(),
+				iDateValueMilliseconds = oDateValue ? oDateValue.getMilliseconds() : 0,
 				sInputValue = this._$input.val(),
 				sFormat = this._getFormatter(true).oFormatOptions.pattern,
 				iIndexOfHH = sFormat.indexOf("HH"),
-				iIndexOfH = sFormat.indexOf("H");
+				iIndexOfH = sFormat.indexOf("H"),
+				sFormattedDate;
 
 			var oCurrentDateValue = this._getFormatter(true).parse(sInputValue) || oDateValue;
 			var sDisplayFormattedValue = this._getFormatter(true).format(oCurrentDateValue);
 
 			oClocks.setValue(sDisplayFormattedValue);
 
+			sFormattedDate = this._getPickerParser().format(oDateValue || new Date(),
+				sap.ui.getCore().getConfiguration().getTimezone());
+			oDateValue = this._getPickerParser().parse(sFormattedDate, TimezoneUtil.getLocalTimezone())[ 0 ];
+			oDateValue.setMilliseconds(iDateValueMilliseconds);
+
 			if (this._shouldSetInitialFocusedDateValue()) {
-				oDateValue = this.getInitialFocusedDateValue();
+				oDateValue = this.getInitialFocusedDateValue() || oDateValue;
 			}
 
 			oClocks._setTimeValues(oDateValue, TimePickerInternals._isHoursValue24(sDisplayFormattedValue, iIndexOfHH, iIndexOfH));
@@ -598,23 +624,10 @@ function(
 			var oClocks = this._getClocks();
 
 			if (oClocks) {
-				//WAI-ARIA region
-				this._handleAriaOnExpandCollapse(true);
-
 				oClocks.showFirstClock();
 				oClocks._focusActiveButton();
 			}
-		};
-
-		/**
-		 * Called before the clock picker closes.
-		 *
-		 * @override
-		 * @public
-		 */
-		 TimePicker.prototype.onBeforeClose = function() {
-			//WAI-ARIA region
-			this._handleAriaOnExpandCollapse(false);
+			this.fireAfterValueHelpOpen();
 		};
 
 		/**
@@ -626,6 +639,7 @@ function(
 		 TimePicker.prototype.onAfterClose = function() {
 			this.$().removeClass(InputBase.ICON_PRESSED_CSS_CLASS);
 			this._getClocks().showFirstClock(); // prepare for the next opening
+			this.fireAfterValueHelpClose();
 		};
 
 		/**
@@ -664,31 +678,6 @@ function(
 			oInputs._setTimeValues(oDateValue, TimePickerInternals._isHoursValue24(sDisplayFormattedValue, iIndexOfHH, iIndexOfH));
 		};
 
-		/**
-		 * Called after the numeric picker appears.
-		 *
-		 * @private
-		 */
-		TimePicker.prototype.onAfterNumericOpen = function() {
-			var oInputs = this._getInputs();
-
-			if (oInputs) {
-				//WAI-ARIA region
-				this._handleAriaOnExpandCollapse(true);
-			}
-
-		};
-
-		/**
-		 * Called before the numeric picker closes.
-		 *
-		 * @private
-		 */
-		TimePicker.prototype.onBeforeNumericClose = function() {
-			//WAI-ARIA region
-			this._handleAriaOnExpandCollapse(false);
-		};
-
 		/**
 		 * Returns Value help icon.
 		 *
@@ -1492,7 +1481,6 @@ function(
 				],
 				ariaLabelledBy: InvisibleText.getStaticId("sap.m", "TIMEPICKER_SET_TIME"),
 				beforeOpen: this.onBeforeOpen.bind(this),
-				beforeClose: this.onBeforeClose.bind(this),
 				afterOpen: this.onAfterOpen.bind(this),
 				afterClose: this.onAfterClose.bind(this)
 			});
@@ -1504,7 +1492,7 @@ function(
 				oPopover.setShowArrow(false);
 			}
 
-			oPopover.oPopup.setAutoCloseAreas([oIcon]);
+			oPopover.oPopup.setExtraContent([oIcon]);
 
 			if (Device.system.phone) {
 				sArialabelledby = this.$("inner").attr("aria-labelledby");
@@ -1600,9 +1588,7 @@ function(
 				],
 
 				ariaLabelledBy: InvisibleText.getStaticId("sap.m", "TIMEPICKER_SET_TIME"),
-				beforeOpen: this.onBeforeNumericOpen.bind(this),
-				afterOpen: this.onAfterNumericOpen.bind(this),
-				beforeClose: this.onBeforeNumericClose.bind(this)
+				beforeOpen: this.onBeforeNumericOpen.bind(this)
 			});
 
 			oPicker.open = function() {
@@ -1651,7 +1637,11 @@ function(
 		 */
 		TimePicker.prototype._handleOkPress = function(oEvent) {
 			var oDate = this._getClocks().getTimeValues(),
-				sValue;
+				sValue,
+				sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+
+			oDate = this._getPickerParser()
+				.parse(sFormattedDate, sap.ui.getCore().getConfiguration().getTimezone())[0];
 
 			this._isClockPicker = true;
 			this._isNumericPicker = false;
@@ -1681,7 +1671,11 @@ function(
 		 */
 		 TimePicker.prototype._handleNumericOkPress = function(oEvent) {
 			var oDate = this._getInputs().getTimeValues(),
-				sValue;
+				sValue,
+				sFormattedDate = this._getPickerParser().format(oDate, TimezoneUtil.getLocalTimezone());
+
+			oDate = this._getPickerParser()
+				.parse(sFormattedDate, sap.ui.getCore().getConfiguration().getTimezone())[0];
 
 			this._isClockPicker = false;
 			this._isNumericPicker = true;
@@ -1779,15 +1773,6 @@ function(
 
 		};
 
-		/**
-		 * Handles the correct value for ARIA expanded attribute on the TimePicker's input field.
-		 *
-		 * @private
-		 */
-		TimePicker.prototype._handleAriaOnExpandCollapse = function (bExpanded) {
-			this.getFocusDomRef().setAttribute("aria-expanded", bExpanded);
-		};
-
 		/**
 		 * Changes the time value in the input field.
 		 *
@@ -2229,7 +2214,7 @@ function(
 		 * @param {string} sValue
 		 */
 		TimePicker.prototype._getAlteredUserInputValue = function (sValue) {
-			return sValue ? this._formatValue(this._parseValue(sValue), true) : sValue;
+			return sValue ? this._formatValue(this._parseValue(sValue, true), true) : sValue;
 		};
 
 		/**
@@ -2253,7 +2238,6 @@ function(
 				type: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("ACC_CTR_TYPE_TIMEINPUT"),
 				description: [sValue, oRenderer.getLabelledByAnnouncement(this), oRenderer.getDescribedByAnnouncement(this)].join(" ").trim(),
 				autocomplete: "none",
-				expanded: false,
 				haspopup: true,
 				owns: this.getId() + "-clocks"
 			});
@@ -2303,6 +2287,14 @@ function(
 			this._setCursorPosition(Math.max(this._iUserInputStartPosition, iStart));
 		};
 
+		TimePicker.prototype._getPickerParser = function() {
+			if (!this._clocksParser) {
+				this._clocksParser = DateFormat.getDateTimeWithTimezoneInstance({ showTimezone: false });
+			}
+
+			return this._clocksParser;
+		};
+
 		/**
 		 * Fires when the input operation has finished and the value has changed.
 		 *

package/src/sap/m/TimePickerClock.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/TimePickerClocks.js

@@ -50,7 +50,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TimePickerInputs.js

@@ -49,7 +49,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/TimePickerInternals.js

@@ -45,7 +45,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.99.1
+		 * @version 1.102.0
 		 *
 		 * @constructor
 		 * @private
@@ -431,7 +431,7 @@ sap.ui.define([
 		 * @private
 		 */
 		TimePickerInternals.prototype._getTimeSeparators = function (sDisplayFormat) {
-			var aFormatParts = sap.ui.core.format.DateFormat.getInstance({ pattern: sDisplayFormat }).aFormatArray,
+			var aFormatParts = DateFormat.getInstance({ pattern: sDisplayFormat }).aFormatArray,
 				aSeparators = [],
 				bPreviousWasEntity,
 				iIndex;