@openui5/sap.m 1.97.1 → 1.98.0

package/src/sap/m/DynamicDateRange.js

@@ -16,6 +16,7 @@ sap.ui.define([
 	'sap/m/DynamicDateFormat',
 	'sap/m/DynamicDateUtil',
 	'sap/ui/core/IconPool',
+	'sap/ui/core/Icon',
 	"sap/ui/core/LabelEnablement",
 	'sap/ui/core/format/DateFormat',
 	'sap/ui/base/ManagedObjectObserver',
@@ -47,6 +48,7 @@ sap.ui.define([
 		DynamicDateFormat,
 		DynamicDateUtil,
 		IconPool,
+		Icon,
 		LabelEnablement,
 		DateFormat,
 		ManagedObjectObserver,
@@ -116,7 +118,7 @@ sap.ui.define([
 		 * is opened. The dialog is closed via a date time period value selection or by pressing the "Cancel" button.
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public
@@ -221,7 +223,56 @@ sap.ui.define([
 					 *
 					 * @since 1.92
 					 */
-					options: { type: "string[]", group: "Behavior", defaultValue: [] }
+					options: {
+						type: "string[]", group: "Behavior",
+						defaultValue: [
+							"DATE",
+							"TODAY",
+							"YESTERDAY",
+							"TOMORROW",
+							"FIRSTDAYWEEK",
+							"LASTDAYWEEK",
+							"FIRSTDAYMONTH",
+							"LASTDAYMONTH",
+							"FIRSTDAYQUARTER",
+							"LASTDAYQUARTER",
+							"FIRSTDAYYEAR",
+							"LASTDAYYEAR",
+							"DATERANGE",
+							"FROM",
+							"TO",
+							"YEARTODATE",
+							"DATETOYEAR",
+							"LASTDAYS",
+							"LASTWEEKS",
+							"LASTMONTHS",
+							"LASTQUARTERS",
+							"LASTYEARS",
+							"NEXTDAYS",
+							"NEXTWEEKS",
+							"NEXTMONTHS",
+							"NEXTQUARTERS",
+							"NEXTYEARS",
+							"TODAYFROMTO",
+							"THISWEEK",
+							"LASTWEEK",
+							"NEXTWEEK",
+							"SPECIFICMONTH",
+							"THISMONTH",
+							"LASTMONTH",
+							"NEXTMONTH",
+							"THISQUARTER",
+							"LASTQUARTER",
+							"NEXTQUARTER",
+							"QUARTER1",
+							"QUARTER2",
+							"QUARTER3",
+							"QUARTER4",
+							"THISYEAR",
+							"LASTYEAR",
+							"NEXTYEAR"
+						]
+					}
 				},
 				aggregations: {
 					_input: { type: "sap.m.Input", multiple: false, visibility: "hidden" },
@@ -371,7 +422,13 @@ sap.ui.define([
 				this._removeAllListItemDelegates();
 				this._oOptionsList.destroyAggregation("items");
 
-				this._createValueHelpItems().forEach(function(oItem) {
+				this._collectValueHelpItems(this._getOptions(), true).map(function(vOption) {
+					// check if it's a group header
+					if (typeof (vOption) === "string") {
+						return this._createHeaderListItem(vOption);
+					}
+					return this._createListItem(vOption);
+				}, this).forEach(function(oItem) {
 					oItem.addDelegate(this._oListItemDelegate, this);
 					this._oOptionsList.addItem(oItem);
 				}, this);
@@ -446,9 +503,13 @@ sap.ui.define([
 				return iIndexOfQuery === 0 || (iIndexOfQuery > 0 && sSuggestedValue[iIndexOfQuery - 1] === " ");
 			}, this);
 
-			aSuggestionItems.forEach(function(option) {
-				var oSuggestValue = { operator: option.getKey(), values: [] };
-				this._addSuggestionItem(oSuggestValue);
+			this._collectValueHelpItems(aSuggestionItems, true).forEach(function(option) {
+				if (option.getKey) {
+					var oSuggestValue = { operator: option.getKey(), values: [] };
+					this._addSuggestionItem(oSuggestValue);
+				} else {
+					this._addSuggestionGroupItem(option);
+				}
 			}, this);
 
 			var aMatchDigit = sQuery.match(/\d+/);
@@ -461,14 +522,18 @@ sap.ui.define([
 				return option.getValueHelpUITypes(this).length === 1 && option.getValueHelpUITypes(this)[0].getType() === "int";
 			}, this);
 
-			aSuggestionItems.forEach(function(option) {
-				var oSuggestValue = {
-					operator: option.getKey(),
-					values: [
-						parseInt(aMatchDigit[0])
-					]
-				};
-				this._addSuggestionItem(oSuggestValue);
+			this._collectValueHelpItems(aSuggestionItems, false).forEach(function(option) {
+				if (option.getKey) {
+					var oSuggestValue = {
+						operator: option.getKey(),
+						values: [
+							parseInt(aMatchDigit[0])
+						]
+					};
+					this._addSuggestionItem(oSuggestValue);
+				} else {
+					this._addSuggestionGroupItem(option);
+				}
 			}, this);
 		};
 
@@ -528,6 +593,16 @@ sap.ui.define([
 			this._oInput.addSuggestionItem(oItem);
 		};
 
+		/**
+		 * Creates and adds a suggestion group item to the internal input, based on a given value.
+		 *
+		 * @param {string} sGroupValue The value to be set
+		 * @private
+		 */
+		DynamicDateRange.prototype._addSuggestionGroupItem = function(sGroupValue) {
+			this._oInput.addSuggestionItemGroup({text: sGroupValue});
+		};
+
 		/**
 		 * Handles input field change.
 		 *
@@ -636,13 +711,22 @@ sap.ui.define([
 			}
 		};
 
-		DynamicDateRange.prototype._createValueHelpItems = function() {
+		/**
+		 * Sorts, groups and reduces the items to be shown as suggestions.
+		 *
+		 * @param {array} aArray The array to be reworked
+		 * @param {boolean} bReduce If reducing is needed
+		 * @returns {array} The array with the objects to be displayed
+		 * @private
+		 */
+		DynamicDateRange.prototype._collectValueHelpItems = function(aArray, bReduce) {
 			var lastXOption;
 			var nextXOption;
 			var aGroupHeaders = [];
 
 			// get the control options' metadata
-			var aOptions = this._getOptions();
+			var aOptions = aArray;
+			var aStandardDynamicDateRangeKeysArray = DynamicDateUtil.getStandardKeys();
 
 			// sort by group
 			aOptions.sort(function(a, b) {
@@ -652,31 +736,33 @@ sap.ui.define([
 					return iGroupDiff;
 				}
 
-				return library.StandardDynamicDateRangeKeys.indexOf(a.getKey()) - library.StandardDynamicDateRangeKeys.indexOf(b.getKey());
+				return aStandardDynamicDateRangeKeysArray.indexOf(a.getKey()) - aStandardDynamicDateRangeKeysArray.indexOf(b.getKey());
 			});
 
-			// for last x/next x options leave only the first of each, remove the rest
-			aOptions = aOptions.reduce(function(aResult, oCurrent) {
-				if (StandardDynamicDateOption.LastXKeys.indexOf(oCurrent.getKey()) !== -1) {
-					if (lastXOption) {
-						return aResult;
+			if (bReduce) {
+				// for last x/next x options leave only the first of each, remove the rest
+				aOptions = aOptions.reduce(function(aResult, oCurrent) {
+					if (StandardDynamicDateOption.LastXKeys.indexOf(oCurrent.getKey()) !== -1) {
+						if (lastXOption) {
+							return aResult;
+						}
+
+						lastXOption = true;
 					}
 
-					lastXOption = true;
-				}
+					if (StandardDynamicDateOption.NextXKeys.indexOf(oCurrent.getKey()) !== -1) {
+						if (nextXOption) {
+							return aResult;
+						}
 
-				if (StandardDynamicDateOption.NextXKeys.indexOf(oCurrent.getKey()) !== -1) {
-					if (nextXOption) {
-						return aResult;
+						nextXOption = true;
 					}
 
-					nextXOption = true;
-				}
-
-				aResult.push(oCurrent);
+					aResult.push(oCurrent);
 
-				return aResult;
-			}, []);
+					return aResult;
+				}, []);
+			}
 
 			if (this.getEnableGroupHeaders()) {
 				// insert a group header string before the options from each group
@@ -693,22 +779,13 @@ sap.ui.define([
 				}, []);
 			}
 
-			// create a list item for each option
-			// and a group header list item for each group header
-			return aOptions.map(function(vOption) {
-				// check if it's a group header
-				if (typeof (vOption) === "string") {
-					return this._createHeaderListItem(vOption);
-				}
-
-				return this._createListItem(vOption);
-			}, this);
+			return aOptions;
 		};
 
 		DynamicDateRange.prototype._createListItem = function(oOption) {
 			var bIsFixedOption = this._isFixedOption(oOption);
 
-			return new DynamicDateRangeListItem({
+			return new DynamicDateRangeListItem(this.getId() + "-option-" + oOption.getKey(),  {
 				type: bIsFixedOption ? ListType.Active : ListType.Navigation,
 				title: oOption.getText(this),
 				wrapping: true,
@@ -1178,6 +1255,16 @@ sap.ui.define([
 			return this.bFocusoutDueRendering;
 		};
 
+		DynamicDateRangeInput.prototype.shouldSuggetionsPopoverOpenOnMobile = function(oEvent) {
+			var bIsClickedOnIcon = oEvent.srcControl instanceof Icon;
+			return this.isMobileDevice()
+				&& this.getEditable()
+				&& this.getEnabled()
+				&& this.getShowSuggestion()
+				&& !bIsClickedOnIcon
+				&& (!this._bClearButtonPressed);
+		};
+
 		var DynamicDateRangeListItem = StandardListItem.extend("sap.m.DynamicDateRangeListItem", {
 			metadata: {
 				library: "sap.m",

package/src/sap/m/DynamicDateUtil.js

@@ -13,6 +13,59 @@ sap.ui.define([
 	StandardDynamicDateOption, Log, library) {
 	"use strict";
 
+	var STANDARD_KEYS_ARRAY = [
+		"DATE",
+		"TODAY",
+		"YESTERDAY",
+		"TOMORROW",
+
+		"FIRSTDAYWEEK",
+		"LASTDAYWEEK",
+		"FIRSTDAYMONTH",
+		"LASTDAYMONTH",
+		"FIRSTDAYQUARTER",
+		"LASTDAYQUARTER",
+		"FIRSTDAYYEAR",
+		"LASTDAYYEAR",
+		"DATERANGE",
+		"FROM",
+		"TO",
+		"YEARTODATE",
+		"DATETOYEAR",
+		"LASTDAYS",
+		"LASTWEEKS",
+		"LASTMONTHS",
+		"LASTQUARTERS",
+		"LASTYEARS",
+		"NEXTDAYS",
+		"NEXTWEEKS",
+		"NEXTMONTHS",
+		"NEXTQUARTERS",
+		"NEXTYEARS",
+		"TODAYFROMTO",
+
+		"THISWEEK",
+		"LASTWEEK",
+		"NEXTWEEK",
+
+		"SPECIFICMONTH",
+		"THISMONTH",
+		"LASTMONTH",
+		"NEXTMONTH",
+
+		"THISQUARTER",
+		"LASTQUARTER",
+		"NEXTQUARTER",
+		"QUARTER1",
+		"QUARTER2",
+		"QUARTER3",
+		"QUARTER4",
+
+		"THISYEAR",
+		"LASTYEAR",
+		"NEXTYEAR"
+	];
+
 	/**
 	 * @class
 	 * The DynamicDateUtil is a utility class for working with the DynamicDateOption instances.
@@ -27,6 +80,14 @@ sap.ui.define([
 			"TODAY": new StandardDynamicDateOption({ key: "TODAY", valueTypes: [] }),
 			"YESTERDAY": new StandardDynamicDateOption({ key: "YESTERDAY", valueTypes: [] }),
 			"TOMORROW": new StandardDynamicDateOption({ key: "TOMORROW", valueTypes: [] }),
+			"FIRSTDAYWEEK": new StandardDynamicDateOption({ key: "FIRSTDAYWEEK", valueTypes: [] }),
+			"LASTDAYWEEK": new StandardDynamicDateOption({ key: "LASTDAYWEEK", valueTypes: [] }),
+			"FIRSTDAYMONTH":new StandardDynamicDateOption({ key: "FIRSTDAYMONTH", valueTypes: [] }),
+			"LASTDAYMONTH":new StandardDynamicDateOption({ key: "LASTDAYMONTH", valueTypes: [] }),
+			"FIRSTDAYQUARTER":new StandardDynamicDateOption({ key: "FIRSTDAYQUARTER", valueTypes: [] }),
+			"LASTDAYQUARTER":new StandardDynamicDateOption({ key: "LASTDAYQUARTER", valueTypes: [] }),
+			"FIRSTDAYYEAR":new StandardDynamicDateOption({ key: "FIRSTDAYYEAR", valueTypes: [] }),
+			"LASTDAYYEAR":new StandardDynamicDateOption({ key: "LASTDAYYEAR", valueTypes: [] }),
 			"THISWEEK": new StandardDynamicDateOption({ key: "THISWEEK", valueTypes: [] }),
 			"THISMONTH": new StandardDynamicDateOption({ key: "THISMONTH", valueTypes: [] }),
 			"THISQUARTER": new StandardDynamicDateOption({ key: "THISQUARTER", valueTypes: [] }),
@@ -62,7 +123,7 @@ sap.ui.define([
 			"DATERANGE": new StandardDynamicDateOption({ key: "DATERANGE", valueTypes: ["date", "date"] }),
 			"DATE": new StandardDynamicDateOption({ key: "DATE", valueTypes: ["date"] })
 		},
-		_allKeys: library.StandardDynamicDateRangeKeys.slice(0)
+		_allKeys: STANDARD_KEYS_ARRAY.slice(0)
 	};
 
 	/**
@@ -109,6 +170,17 @@ sap.ui.define([
 		return DynamicDateUtil._options[sKey];
 	};
 
+	/**
+	 * Gets sorted array of all standard keys.
+	 *
+	 * @returns {string[]} An array of standard option keys
+	 * @static
+	 * @public
+	 */
+	DynamicDateUtil.getStandardKeys = function () {
+		return STANDARD_KEYS_ARRAY.slice(0);
+	};
+
 	/**
 	 * Parses a string to an array of objects in the DynamicDateRange's value format.
 	 * Uses the provided formatter.
@@ -127,12 +199,13 @@ sap.ui.define([
 		}
 
 		var aResults = [],
-			oResult;
+			oResult,
+			aStandardDynamicDateRangeKeysArray = DynamicDateUtil.getStandardKeys();
 
 		aOptionKeys = aOptionKeys || Object.keys(DynamicDateUtil._options);
 
 		var aOptions = aOptionKeys.sort(function(sKey1, sKey2) {
-			return library.StandardDynamicDateRangeKeys.indexOf(sKey1) - library.StandardDynamicDateRangeKeys.indexOf(sKey2);
+			return aStandardDynamicDateRangeKeysArray.indexOf(sKey1) - aStandardDynamicDateRangeKeysArray.indexOf(sKey2);
 		}).map(function(sKey) {
 			return DynamicDateUtil._options[sKey];
 		});

package/src/sap/m/DynamicDateValueHelpUIType.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @public
 		 * @since 1.92
@@ -39,10 +39,15 @@ sap.ui.define(['sap/ui/core/Element'],
 					type: { type: "string" },
 
 					/**
-					 * A text for an additional label describing the interactive UI.
+					 * A text for an additional label that describes the interactive UI and is placed before the UI element.
 					 */
 					text: { type: "string" },
 
+					/**
+					 * A text for an additional label that describes the interactive UI and is placed after the UI element.
+					 */
+					additionalText: { type: "string" },
+
 					/**
 					 * Describes the options in a radio button group.
  					 */

package/src/sap/m/ExpandableText.js

@@ -100,7 +100,7 @@ function(library,
 	 * @implements sap.ui.core.IFormContent, sap.m.IHyphenation
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilter.js

@@ -170,7 +170,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Control
 	 * @implements sap.ui.core.IShrinkable
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public
@@ -2327,27 +2327,30 @@ sap.ui.define([
 	 * @private
 	 */
 	FacetFilter.prototype.onclick = function(oEvent) {
+		var oTarget = oEvent.target,
+			sId = this.getId();
 
-		var sTargetId = oEvent.target.id;
+		if (!oTarget.id) {
+			oTarget = oTarget.parentElement;
+		}
 
-		if (sTargetId) {
-			var sId = this.getId(),
-				oTarget = oEvent.target;
+		if (!oTarget.id) {
+			return;
+		}
 
-			// Prevent IE from firing beforeunload event -> see CSN 4378288 2012
-			oEvent.preventDefault();
+		// Prevent IE from firing beforeunload event -> see CSN 4378288 2012
+		oEvent.preventDefault();
 
-			if (sTargetId == sId + "-arrowScrollLeft") {
-				// scroll back/left button
-				oTarget.tabIndex = -1;
-				oTarget.focus();
-				this._scroll(-FacetFilter.SCROLL_STEP, SCROLL_DURATION);
-			} else if (sTargetId == sId + "-arrowScrollRight") {
-				// scroll forward/right button
-				oTarget.tabIndex = -1;
-				oTarget.focus();
-				this._scroll(FacetFilter.SCROLL_STEP, SCROLL_DURATION);
-			}
+		if (oTarget.id == sId + "-arrowScrollLeft") {
+			// scroll back/left button
+			oTarget.tabIndex = -1;
+			oTarget.focus();
+			this._scroll(-FacetFilter.SCROLL_STEP, SCROLL_DURATION);
+		} else if (oTarget.id == sId + "-arrowScrollRight") {
+			// scroll forward/right button
+			oTarget.tabIndex = -1;
+			oTarget.focus();
+			this._scroll(FacetFilter.SCROLL_STEP, SCROLL_DURATION);
 		}
 	};
 

package/src/sap/m/FacetFilterItem.js

@@ -20,7 +20,7 @@ sap.ui.define(['./ListItemBase', './library', './FacetFilterItemRenderer'],
 	 * @class
 	 * Represents a value for the {@link sap.m.FacetFilterList} control.
 	 * @extends sap.m.ListItemBase
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FacetFilterList.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * be closed.
 	 *
 	 * @extends sap.m.List
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedContent.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @since 1.34
 	 *
 	 * @public

package/src/sap/m/FeedInput.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItem.js

@@ -54,7 +54,7 @@ function(
 	 * @extends sap.m.ListItemBase
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FeedListItemAction.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/ui/core/Element"],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/Fiori20Adapter.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @class text
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @since 1.38
 	 * @alias HeaderAdapter
@@ -227,7 +227,7 @@ sap.ui.define([
 	 * Constructor for an sap.m.Fiori20Adapter.
 	 *
 	 * @class text
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @private
 	 * @since 1.38
 	 * @alias sap.m.Fiori20Adapter

package/src/sap/m/FlexBox.js

@@ -62,7 +62,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @public
 	 * @alias sap.m.FlexBox

package/src/sap/m/FlexItemData.js

@@ -24,7 +24,7 @@ sap.ui.define(["./FlexBoxStylingHelper", "./library", "sap/ui/core/LayoutData"],
 	 * @class
 	 * Holds layout data for a FlexBox / HBox / VBox.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/FormattedText.js

@@ -42,7 +42,7 @@ function(
 		 * @class
 		 * The FormattedText control allows the usage of a limited set of tags for inline display of formatted text in HTML format.
 		 * @extends sap.ui.core.Control
-		 * @version 1.97.1
+		 * @version 1.98.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/m/GenericTag.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/GenericTile.js

@@ -64,7 +64,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.98.0
 	 * @since 1.34.0
 	 *
 	 * @public
@@ -237,7 +237,19 @@ sap.ui.define([
 				/**
 				 * The hidden aggregation for the message in the failed state.
 				 */
-				_failedMessageText: {type: "sap.m.Text", multiple: false, visibility: "hidden"}
+				_failedMessageText: {type: "sap.m.Text", multiple: false, visibility: "hidden"},
+				/**
+				 * The hidden aggregation for the Tile Icon Works only in IconMode.
+				 * @experimental since 1.96
+				 * @private
+				 */
+				_tileIcon: {type: "sap.ui.core.Icon", multiple: false, visibility: "hidden"},
+				 /**
+				 * The hidden aggregation for the Tile Icon Image. Works only in IconMode.
+				 * @experimental since 1.96
+				 * @private
+				 */
+				_tileIconImage: {type: "sap.m.Image", multiple: false, visibility: "hidden"}
 			},
 			events: {
 				/**
@@ -347,6 +359,7 @@ sap.ui.define([
 
 		//Navigate Action Button in Article Mode
 		this._oNavigateAction = new Button(this.getId() + "-navigateAction");
+		this._oNavigateAction._bExcludeFromTabChain = true;
 		this.addDependent(this._oNavigateAction);
 	};
 
@@ -1522,11 +1535,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the icon to be rendered for IconMode
+	 * Set and return aggregation of Icon to be rendered in IconMode
 	 * @param {*} oIcon Icon to be displayed on the GenericTile.
+	 * @returns {String} Returns the icon hidden aggregation
 	 * @private
 	 */
-	 GenericTile.prototype._renderTileIcon = function (oIcon) {
+	 GenericTile.prototype._generateIconAggregation = function (oIcon) {
+		var sAggregation = "";
 		this._oIcon = IconPool.createControlByURI({
 			size: this.getFrameType() === FrameType.OneByOne ? "2rem" : "1.25rem",
 			useIconTooltip: false,
@@ -1541,7 +1556,19 @@ sap.ui.define([
 			}, Image).addStyleClass("sapMPointer").addStyleClass("sapMGTTileIcon");
 		}
 		this._oIcon.addStyleClass("sapMPointer").addStyleClass("sapMGTTileIcon");
-		return this._oIcon;
+
+		//Add Icon or Image as hidden Aggregation
+		if (this._oIcon instanceof Image) {
+			sAggregation = "_tileIconImage";
+		} else if (this._oIcon instanceof Icon) {
+			sAggregation = "_tileIcon";
+		}
+
+		if (sAggregation) {
+			this.setAggregation(sAggregation, this._oIcon);
+		}
+
+		return sAggregation;
 	};
 
 	/**