@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/SelectDialogBase.js

@@ -8,16 +8,16 @@
 sap.ui.define([
 		'./library',
 		'sap/ui/Device',
-		'sap/ui/core/Core',
 		'sap/ui/core/Control',
-		'sap/ui/core/InvisibleText'
+		'sap/ui/core/InvisibleText',
+		"sap/ui/core/Lib"
 ],
 function(
 	library,
 	Device,
-	Core,
 	Control,
-	InvisibleText
+	InvisibleText,
+	Library
 ) {
 	"use strict";
 
@@ -36,7 +36,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -151,7 +151,7 @@ function(
 	SelectDialogBase.getInvisibleText = function() {
 		if (!this.oInvisibleText) {
 			this.oInvisibleText = new InvisibleText({
-				text: Core.getLibraryResourceBundle("sap.m").getText("SELECTDIALOGBASE_LISTLABEL")
+				text: Library.getResourceBundleFor("sap.m").getText("SELECTDIALOGBASE_LISTLABEL")
 			}).toStatic();
 		}
 

package/src/sap/m/SelectList.js

@@ -34,7 +34,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -578,7 +578,7 @@ sap.ui.define([
 			this.setProperty("selectedItemId", (vItem instanceof Item) ? vItem.getId() : vItem);
 
 			if (typeof vItem === "string") {
-				vItem = Element.registry.get(vItem);
+				vItem = Element.getElementById(vItem);
 			}
 
 			this.setProperty("selectedKey", vItem ? vItem.getKey() : "", true);
@@ -916,7 +916,7 @@ sap.ui.define([
 		/**
 		 * Sets the <code>selectedItem</code> association.
 		 *
-		 * @param {string | sap.ui.core.Item | null} vItem New value for the <code>selectedItem</code> association.
+		 * @param {sap.ui.core.ID | sap.ui.core.Item | null} vItem New value for the <code>selectedItem</code> association.
 		 * If an ID of a <code>sap.ui.core.Item</code> is given, the item with this ID becomes the <code>selectedItem</code> association.
 		 * Alternatively, a <code>sap.ui.core.Item</code> instance may be given or <code>null</code> to clear the selection.
 		 *
@@ -927,7 +927,7 @@ sap.ui.define([
 
 			if (typeof vItem === "string") {
 				this.setAssociation("selectedItem", vItem, true);
-				vItem = Element.registry.get(vItem);
+				vItem = Element.getElementById(vItem);
 			}
 
 			if (!(vItem instanceof Item) && vItem !== null) {
@@ -992,7 +992,7 @@ sap.ui.define([
 		 */
 		SelectList.prototype.getSelectedItem = function() {
 			var vSelectedItem = this.getAssociation("selectedItem");
-			return (vSelectedItem === null) ? null : Element.registry.get(vSelectedItem) || null;
+			return (vSelectedItem === null) ? null : Element.getElementById(vSelectedItem) || null;
 		};
 
 		/**
@@ -1057,7 +1057,7 @@ sap.ui.define([
 		/**
 		 * Removes an item from the aggregation named <code>items</code>.
 		 *
-		 * @param {int | string | sap.ui.core.Item} vItem The item to remove or its index or id.
+		 * @param {int | sap.ui.core.ID | sap.ui.core.Item} vItem The item to remove or its index or id.
 		 * @returns {sap.ui.core.Item|null} The removed item or <code>null</code>.
 		 * @public
 		 */

package/src/sap/m/SelectionDetails.js

@@ -10,6 +10,8 @@ sap.ui.define([
 	'sap/m/Button',
 	'sap/ui/base/Interface',
 	'sap/ui/Device',
+	"sap/ui/core/ControlBehavior",
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	'./SelectionDetailsRenderer',
 	'sap/base/util/uid',
@@ -21,6 +23,8 @@ function(
 	Button,
 	Interface,
 	Device,
+	ControlBehavior,
+	Library,
 	CoreLibrary,
 	SelectionDetailsRenderer,
 	uid,
@@ -39,7 +43,7 @@ function(
 	 * <b><i>Note:</i></b>It is protected and should only be used within the framework itself.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @extends sap.ui.core.Control
 	 * @constructor
@@ -157,7 +161,7 @@ function(
 		// Indicates whether the labels are wrapped
 		this._bWrapLabels = false;
 
-		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._oRb = Library.getResourceBundleFor("sap.m");
 		this.setAggregation("_button", new Button({
 			id: this.getId() + "-button",
 			type: library.ButtonType.Transparent,
@@ -369,7 +373,7 @@ function(
 
 			height = Math.min(SelectionDetails._POPOVER_MAX_HEIGHT, height);
 			oPopover._oControl._deregisterContentResizeHandler();
-			var bAnimationMode = Configuration.getAnimationMode() !== Configuration.AnimationMode.none;
+			var bAnimationMode = ControlBehavior.getAnimationMode() !== Configuration.AnimationMode.none;
 			$PopoverContent.animate({
 				"height": Math.min(height, iMaxHeight)
 			}, bAnimationMode ? 100 : 0, function() {

package/src/sap/m/SelectionDetailsFacade.js

@@ -10,7 +10,7 @@
  * @since 1.48.0
  * @public
  * @author SAP SE
- * @version 1.120.6
+ * @version 1.121.0
  * @borrows sap.ui.core.Element#addCustomData as #addCustomData
  * @borrows sap.ui.core.Element#getCustomData as #getCustomData
  * @borrows sap.ui.core.Element#indexOfCustomData as #indexOfCustomData
@@ -45,7 +45,7 @@
  * @since 1.48.0
  * @public
  * @author SAP SE
- * @version 1.120.6
+ * @version 1.121.0
  * @borrows sap.ui.core.Element#addCustomData as #addCustomData
  * @borrows sap.ui.core.Element#getCustomData as #getCustomData
  * @borrows sap.ui.core.Element#indexOfCustomData as #indexOfCustomData

package/src/sap/m/SelectionDetailsItem.js

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @protected

package/src/sap/m/SelectionDetailsItemLine.js

@@ -23,7 +23,7 @@ sap.ui.define(["sap/ui/core/Element", "sap/base/Log", "sap/base/util/isPlainObje
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @protected

package/src/sap/m/Shell.js

@@ -9,6 +9,7 @@ sap.ui.define([
 	'./library',
 	'sap/ui/core/Core',
 	'sap/ui/core/Control',
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	'sap/m/Image',
 	'sap/m/ShellRenderer',
@@ -16,7 +17,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/core/theming/Parameters"
 ],
-	function(library, Core, Control, coreLibrary, Image, ShellRenderer, Mobile, Log, ThemeParameters) {
+	function(library, Core, Control, Library, coreLibrary, Image, ShellRenderer, Mobile, Log, ThemeParameters) {
 		"use strict";
 
 
@@ -36,7 +37,7 @@ sap.ui.define([
 		 * The Shell control can be used as root element of applications. It can contain an App or a <code>SplitApp</code> control.
 		 * The Shell provides some overarching functionality for the overall application and takes care of visual adaptation, such as a frame around the App, on desktop browser platforms.
 		 * @extends sap.ui.core.Control
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -165,7 +166,6 @@ sap.ui.define([
 
 				if ($hdr.length && sImgSrc) {
 					this._getImage().setSrc(sImgSrc);
-					this._getImage().rerender();
 				}
 			}, this);
 
@@ -268,7 +268,7 @@ sap.ui.define([
 			if (!this.oImg) {
 				this.oImg = new Image(this.getId() + "-logo", {
 					decorative: false,
-					alt: sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("SHELL_ARIA_LOGO")
+					alt: Library.getResourceBundleFor("sap.m").getText("SHELL_ARIA_LOGO")
 				});
 
 				this.oImg.addStyleClass("sapMShellLogoImg");

package/src/sap/m/ShellRenderer.js

@@ -5,10 +5,11 @@
  */
 
 sap.ui.define([
+	"sap/ui/core/Lib",
 	'sap/ui/core/library',
 	'sap/m/library'
 ],
-function(coreLibrary, library) {
+function(Library, coreLibrary, library) {
 	"use strict";
 
 
@@ -110,7 +111,7 @@ function(coreLibrary, library) {
 
 		// logout button
 		if (oControl.getShowLogout()) {
-			var rb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+			var rb = Library.getResourceBundleFor("sap.m");
 			rm.openStart("a", oControl.getId() + "-logout");
 			rm.attr("tabindex", "0");
 			rm.attr("role", "button");

package/src/sap/m/SimpleFixFlex.js

@@ -31,7 +31,7 @@ function(Control, ResizeHandler, Log, SimpleFixFlexRenderer) {
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/m/SinglePlanningCalendar.js

@@ -15,7 +15,9 @@ sap.ui.define([
 	'./SinglePlanningCalendarRenderer',
 	'sap/base/Log',
 	'sap/ui/core/Control',
+	"sap/ui/core/Element",
 	'sap/ui/core/InvisibleText',
+	"sap/ui/core/Lib",
 	'sap/ui/core/ResizeHandler',
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/unified/calendar/CalendarDate',
@@ -37,7 +39,9 @@ function(
 	SinglePlanningCalendarRenderer,
 	Log,
 	Control,
+	Element,
 	InvisibleText,
+	Library,
 	ResizeHandler,
 	DateFormat,
 	CalendarDate,
@@ -107,7 +111,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -279,7 +283,35 @@ function(
 				/**
 				 * Special days in the header visualized as a date range with type.
 				 *
-				 * <b>Note:</b> If one day is assigned to more than one type, only the first type is used.
+				 * <b>Note:</b> In case there are multiple <code>sap.ui.unified.DateTypeRange</code> instances given for a single date,
+				 * only the first <code>sap.ui.unified.DateTypeRange</code> instance will be used.
+				 * For example, using the following sample, the 1st of November will be displayed as a working day of type "Type10":
+				 *
+				 *
+				 *	<pre>
+				 *	new DateTypeRange({
+				 *		startDate: UI5Date.getInstance(2023, 10, 1),
+				 *		type: CalendarDayType.Type10,
+				 *	}),
+				 *	new DateTypeRange({
+				 *		startDate: UI5Date.getInstance(2023, 10, 1),
+				 *		type: CalendarDayType.NonWorking
+				 *	})
+				 *	</pre>
+				 *
+				 * If you want the first of November to be displayed as a non-working day and also as "Type10," the following should be done:
+				 *	<pre>
+				 *	new DateTypeRange({
+				 *		startDate: UI5Date.getInstance(2023, 10, 1),
+				 *		type: CalendarDayType.Type10,
+				 *		secondaryType: CalendarDayType.NonWorking
+				 *	})
+				 *	</pre>
+				 *
+				 * You can use only one of the following types for a given date: <code>sap.ui.unified.CalendarDayType.NonWorking</code>,
+				 * <code>sap.ui.unified.CalendarDayType.Working</code> or <code>sap.ui.unified.CalendarDayType.None</code>.
+				 * Assigning more than one of these values in combination for the same date will lead to unpredictable results.
+				 *
 				 * @since 1.66
 				 */
 				specialDates : {type : "sap.ui.unified.DateTypeRange",
@@ -513,7 +545,7 @@ function(
 	SinglePlanningCalendar.prototype.init = function() {
 		var sOPCId = this.getId();
 
-		this._oRB = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._oRB = Library.getResourceBundleFor("sap.m");
 		this._oDefaultView = new SinglePlanningCalendarWeekView({
 			key: "DEFAULT_INNER_WEEK_VIEW_CREATED_FROM_CONTROL",
 			title: ""
@@ -699,7 +731,7 @@ function(
 
 	/**
 	 * Removes the selected dates of the grid.
-	 * @returns {object} An array of the removed DateRange objects
+	 * @returns {sap.ui.unified.DateRange[]} An array of the removed DateRange objects
 	 * @public
 	 */
 	SinglePlanningCalendar.prototype.removeAllSelectedDates = function () {
@@ -708,7 +740,7 @@ function(
 
 	/**
 	 * Gets the selected dates of the grid.
-	 * @returns {object} An array of DateRange objects
+	 * @returns {sap.ui.unified.DateRange[]} An array of DateRange objects
 	 * @public
 	 */
 	SinglePlanningCalendar.prototype.getSelectedDates = function () {
@@ -717,7 +749,7 @@ function(
 
 	/**
 	 * Adds a selected date to the grid.
-	 * @param {object} oSelectedDate A DateRange object
+	 * @param {sap.ui.unified.DateRange} oSelectedDate A DateRange object
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 * @public
 	 */
@@ -919,7 +951,7 @@ function(
 	 * @private
 	 */
 	SinglePlanningCalendar.prototype._viewsObserverCallbackFunction = function (oChanges) {
-		sap.ui.getCore().byId(oChanges.object.getId() + SEGMENTEDBUTTONITEM__SUFFIX).setText(oChanges.current);
+		Element.getElementById(oChanges.object.getId() + SEGMENTEDBUTTONITEM__SUFFIX).setText(oChanges.current);
 	};
 
 	/**
@@ -1007,7 +1039,7 @@ function(
 		if (sLegend) {
 			this.getAggregation("_grid")._sLegendId = sLegend;
 			this.getAggregation("_mvgrid")._sLegendId = sLegend;
-			oLegend = sap.ui.getCore().byId(sLegend);
+			oLegend = Element.getElementById(sLegend);
 		}
 
 		if (oLegend) { //destroy of the associated legend should rerender the SPC
@@ -1150,7 +1182,7 @@ function(
 	SinglePlanningCalendar.prototype._getSelectedView = function () {
 		var oSelectedView,
 			aViews = this.getViews(),
-			sCurrentViewKey = sap.ui.getCore().byId(this.getAssociation("selectedView")).getKey();
+			sCurrentViewKey = Element.getElementById(this.getAssociation("selectedView")).getKey();
 
 		for (var i = 0; i < aViews.length; i++) {
 			if (sCurrentViewKey === aViews[i].getKey()) {

package/src/sap/m/SinglePlanningCalendarDayView.js

@@ -25,7 +25,7 @@ function (library, SinglePlanningCalendarView) {
 	 * @extends sap.m.SinglePlanningCalendarView
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/SinglePlanningCalendarGrid.js

@@ -6,37 +6,44 @@
 
 // Provides control sap.m.SinglePlanningCalendarGrid.
 sap.ui.define([
-		'./SinglePlanningCalendarUtilities',
-		'./library',
-		'sap/ui/unified/DateRange',
-		'sap/ui/core/Control',
-		'sap/ui/core/LocaleData',
-		'sap/ui/core/Locale',
-		'sap/ui/core/InvisibleText',
-		'sap/ui/core/format/DateFormat',
-		'sap/ui/core/format/TimezoneUtil',
-		'sap/ui/core/Core',
-		'sap/ui/core/date/UniversalDate',
-		'sap/ui/core/dnd/DragDropInfo',
-		'sap/ui/unified/library',
-		'sap/ui/unified/calendar/DatesRow',
-		'sap/ui/unified/calendar/CalendarDate',
-		'sap/ui/unified/calendar/CalendarUtils',
-		'sap/ui/unified/DateTypeRange',
-		'sap/ui/events/KeyCodes',
-		'./SinglePlanningCalendarGridRenderer',
-		'sap/ui/core/delegate/ItemNavigation',
-		"sap/ui/thirdparty/jquery",
-		'./PlanningCalendarLegend',
-		'sap/ui/core/InvisibleMessage',
-		'sap/ui/core/library',
-		"sap/ui/core/date/CalendarUtils",
-		"sap/ui/core/Configuration",
-		"sap/ui/core/date/UI5Date"
-	],
-	function (
+	'./SinglePlanningCalendarUtilities',
+	'./library',
+	"sap/base/i18n/Formatting",
+	"sap/base/i18n/Localization",
+	"sap/ui/core/Element",
+	"sap/ui/core/Lib",
+	'sap/ui/unified/DateRange',
+	'sap/ui/core/Control',
+	'sap/ui/core/LocaleData',
+	'sap/ui/core/Locale',
+	'sap/ui/core/InvisibleText',
+	'sap/ui/core/format/DateFormat',
+	'sap/ui/core/format/TimezoneUtil',
+	'sap/ui/core/Core',
+	'sap/ui/core/date/UniversalDate',
+	'sap/ui/core/dnd/DragDropInfo',
+	'sap/ui/unified/library',
+	'sap/ui/unified/calendar/DatesRow',
+	'sap/ui/unified/calendar/CalendarDate',
+	'sap/ui/unified/calendar/CalendarUtils',
+	'sap/ui/unified/DateTypeRange',
+	'sap/ui/events/KeyCodes',
+	'./SinglePlanningCalendarGridRenderer',
+	'sap/ui/core/delegate/ItemNavigation',
+	"sap/ui/thirdparty/jquery",
+	'./PlanningCalendarLegend',
+	'sap/ui/core/InvisibleMessage',
+	'sap/ui/core/library',
+	"sap/ui/core/date/CalendarUtils",
+	"sap/ui/core/date/UI5Date"
+],
+	function(
 		SinglePlanningCalendarUtilities,
 		library,
+		Formatting,
+		Localization,
+		Element,
+		Library,
 		DateRange,
 		Control,
 		LocaleData,
@@ -60,7 +67,6 @@ sap.ui.define([
 		InvisibleMessage,
 		coreLibrary,
 		CalendarDateUtils,
-		Configuration,
 		UI5Date
 	) {
 		"use strict";
@@ -111,7 +117,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @private
@@ -217,7 +223,35 @@ sap.ui.define([
 					/**
 					 * Special days in the header visualized as a date range with type.
 					 *
-					 * <b>Note:</b> If one day is assigned to more than one type, only the first type is used.
+					 * <b>Note:</b> In case there are multiple <code>sap.ui.unified.DateTypeRange</code> instances given for a single date,
+					 * only the first <code>sap.ui.unified.DateTypeRange</code> instance will be used.
+					 * For example, using the following sample, the 1st of November will be displayed as a working day of type "Type10":
+					 *
+					 *
+					 *	<pre>
+					 *	new DateTypeRange({
+					 *		startDate: UI5Date.getInstance(2023, 10, 1),
+					 *		type: CalendarDayType.Type10,
+					 *	}),
+					 *	new DateTypeRange({
+					 *		startDate: UI5Date.getInstance(2023, 10, 1),
+					 *		type: CalendarDayType.NonWorking
+					 *	})
+					 *	</pre>
+					 *
+					 * If you want the first of November to be displayed as a non-working day and also as "Type10," the following should be done:
+					 *	<pre>
+					 *	new DateTypeRange({
+					 *		startDate: UI5Date.getInstance(2023, 10, 1),
+					 *		type: CalendarDayType.Type10,
+					 *		secondaryType: CalendarDayType.NonWorking
+					 *	})
+					 *	</pre>
+					 *
+					 * You can use only one of the following types for a given date: <code>sap.ui.unified.CalendarDayType.NonWorking</code>,
+					 * <code>sap.ui.unified.CalendarDayType.Working</code> or <code>sap.ui.unified.CalendarDayType.None</code>.
+					 * Assigning more than one of these values in combination for the same date will lead to unpredictable results.
+					 *
 					 * @since 1.66
 					 */
 					specialDates : {type : "sap.ui.unified.DateTypeRange", multiple : true, singularName : "specialDate"},
@@ -392,12 +426,12 @@ sap.ui.define([
 			this._configureAppointmentsResize();
 			this._configureAppointmentsCreate();
 
-			this._oUnifiedRB = sap.ui.getCore().getLibraryResourceBundle("sap.ui.unified");
+			this._oUnifiedRB = Library.getResourceBundleFor("sap.ui.unified");
 			this._oFormatStartEndInfoAria = DateFormat.getDateTimeInstance({
-				pattern: "EEEE dd/MM/yyyy 'at' " + sTimePattern
+				pattern: "EEEE, MMMM d, yyyy 'at' " + sTimePattern
 			});
 			this._oFormatAriaFullDayCell = DateFormat.getDateTimeInstance({
-				pattern: "EEEE dd/MM/yyyy"
+				pattern: "EEEE, MMMM d, yyyy"
 			});
 
 			this._oFormatYyyymmdd = DateFormat.getInstance({pattern: "yyyyMMdd", calendarType: CalendarType.Gregorian});
@@ -797,7 +831,7 @@ sap.ui.define([
 					oBrowserEvent.dataTransfer.setDragImage(getResizeGhost(), 0, 0);
 
 					var oGrid = oEvent.getParameter("target"),
-						bIsRtl = Configuration.getRTL(),
+						bIsRtl = Localization.getRTL(),
 						aIntervalPlaceholders = oGrid.getAggregation("_intervalPlaceholders"),
 						oFirstIntervalRectangle = aIntervalPlaceholders[0].getDomRef().getBoundingClientRect(),
 						iIntervalHeight = oFirstIntervalRectangle.height,
@@ -1015,7 +1049,7 @@ sap.ui.define([
 		 * @private
 		 */
 		SinglePlanningCalendarGrid.prototype._appFocusHandler = function(oEvent, iDirection) {
-			var oTarget = sap.ui.getCore().byId(oEvent.target.id) || this._findSrcControl(oEvent);
+			var oTarget = Element.getElementById(oEvent.target.id) || this._findSrcControl(oEvent);
 
 			if (oTarget && oTarget.isA("sap.ui.unified.CalendarAppointment")) {
 				this.fireAppointmentSelect({
@@ -1291,6 +1325,9 @@ sap.ui.define([
 				this._bMultiDateSelectWithArrow = true;
 			} else if (oEvent.which === KeyCodes.SPACE && !oEvent.shiftKey && bMultiDateSelection) {
 				this._bMultiDateSelect = true;
+			} else if (oEvent.which === KeyCodes.SPACE && !oEvent.shiftKey) {
+				this.removeAllSelectedDates();
+				this._bMultiDateSelect = true;
 			}
 			this._fireSelectionEvent(oEvent);
 			// Prevent scrolling
@@ -2115,7 +2152,7 @@ sap.ui.define([
 		 */
 		SinglePlanningCalendarGrid.prototype._getCoreLocaleId = function () {
 			if (!this._sLocale) {
-				this._sLocale = Configuration.getFormatSettings().getFormatLocale().toString();
+				this._sLocale = new Locale(Formatting.getLanguageTag()).toString();
 			}
 
 			return this._sLocale;
@@ -2211,13 +2248,27 @@ sap.ui.define([
 		 * @private
 		 */
 		SinglePlanningCalendarGrid.prototype._getAppointmentAnnouncementInfo = function (oAppointment) {
-			var sStartTime = this._oUnifiedRB.getText("CALENDAR_START_TIME"),
-				sEndTime = this._oUnifiedRB.getText("CALENDAR_END_TIME"),
-				sFormattedStartDate = this._oFormatStartEndInfoAria.format(oAppointment.getStartDate()),
-				sFormattedEndDate = this._oFormatStartEndInfoAria.format(oAppointment.getEndDate()),
-				sAppInfo = sStartTime + ": " + sFormattedStartDate + "; " + sEndTime + ": " + sFormattedEndDate;
-
-			return sAppInfo + "; " + PlanningCalendarLegend.findLegendItemForItem(sap.ui.getCore().byId(this._sLegendId), oAppointment);
+			var oStartDate = oAppointment.getStartDate(),
+				oEndDate = oAppointment.getEndDate(),
+				bFullDay = this.isAllDayAppointment(oStartDate, oEndDate),
+				bSingleDay =  this._isSingleDayAppointment(oStartDate, oEndDate),
+				sLegendInfo = PlanningCalendarLegend.findLegendItemForItem(Core.byId(this._sLegendId), oAppointment),
+				sFormattedDate;
+
+			if (bFullDay && bSingleDay) {
+				sFormattedDate = this._oUnifiedRB.getText("CALENDAR_ALL_DAY_INFO", [this._oFormatAriaFullDayCell.format(oStartDate)]);
+			} else if (bFullDay) {
+				sFormattedDate = this._oUnifiedRB.getText( "CALENDAR_APPOINTMENT_INFO", [
+					this._oFormatAriaFullDayCell.format(oStartDate),
+					this._oFormatAriaFullDayCell.format(oEndDate)
+				]);
+			} else {
+				sFormattedDate = this._oUnifiedRB.getText( "CALENDAR_APPOINTMENT_INFO", [
+					this._oFormatStartEndInfoAria.format(oStartDate),
+					this._oFormatStartEndInfoAria.format(oEndDate)
+				]);
+			}
+			return sFormattedDate + ", " + sLegendInfo;
 		};
 
 		/**
@@ -2258,14 +2309,26 @@ sap.ui.define([
 		/**
 		 * Returns whether an appointment starts at 00:00 and ends in 00:00 on any day in the future.
 		 *
-		 * @param {Object} oAppStartDate - Start date of the appointment
-		 * @param {Object} oAppEndDate - End date of the appointment
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oAppStartDate - Start date of the appointment
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oAppEndDate - End date of the appointment
 		 * @returns {boolean}
 		 */
 		SinglePlanningCalendarGrid.prototype.isAllDayAppointment = function(oAppStartDate, oAppEndDate) {
 			return CalendarUtils._isMidnight(oAppStartDate) && CalendarUtils._isMidnight(oAppEndDate);
 		};
 
+		/**
+		 * Returns whether an appointment starts and ends on the same day.
+		 *
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oAppStartDate - Start date of the appointment
+		 * @param {Date|module:sap/ui/core/date/UI5Date} oAppEndDate - End date of the appointment
+		 * @returns {boolean}
+		 * @private
+		 */
+		SinglePlanningCalendarGrid.prototype._isSingleDayAppointment = function(oAppStartDate, oAppEndDate) {
+			return !oAppEndDate || oAppStartDate.getDate() === oAppEndDate.getDate();
+		};
+
 		SinglePlanningCalendarGrid.prototype._createBlockersDndPlaceholders = function (oStartDate, iColumns) {
 			this.destroyAggregation("_blockersPlaceholders");
 
@@ -2304,7 +2367,7 @@ sap.ui.define([
 		};
 
 		SinglePlanningCalendarGrid.prototype._createAppointmentsDndPlaceholders = function (oStartDate, iColumns) {
-			var bIsRtl = Configuration.getRTL(),
+			var bIsRtl = Localization.getRTL(),
 				i;
 
 			this._dndPlaceholdersMap = {};
@@ -2350,13 +2413,18 @@ sap.ui.define([
 		};
 
 		SinglePlanningCalendarGrid.prototype._isNonWorkingDay = function(oCalendarDate) {
-			return this._getSpecialDates().filter(function(oDateRange) {
-				return oDateRange.getType() === unifiedLibrary.CalendarDayType.NonWorking;
-			}).map(function(oDateRange) {
-				return CalendarDate.fromLocalJSDate(oDateRange.getStartDate());
-			}).some(function(oDate) {
-				return oDate.isSame(oCalendarDate);
+			const aSpecialDates = this._getSpecialDates().filter((oDateRange) => {
+				return oDateRange.getStartDate() && CalendarDate.fromLocalJSDate(oDateRange.getStartDate()).isSame(oCalendarDate);
 			});
+			const sType = aSpecialDates.length > 0 && aSpecialDates[0].getType();
+			const sSecondaryType =  aSpecialDates.length > 0 && aSpecialDates[0].getSecondaryType();
+			const bNonWorkingWeekend = CalendarUtils._isWeekend(oCalendarDate, this._getCoreLocaleData())
+				&& sType !== unifiedLibrary.CalendarDayType.Working
+				&& sSecondaryType !== unifiedLibrary.CalendarDayType.Working;
+
+			return sType === unifiedLibrary.CalendarDayType.NonWorking
+				|| sSecondaryType === unifiedLibrary.CalendarDayType.NonWorking
+				|| bNonWorkingWeekend;
 		};
 
 		function getResizeGhost() {