@openui5/sap.m 1.120.6 → 1.121.0

package/src/sap/m/VariantManagement.js

@@ -6,6 +6,8 @@
 
 // Provides control sap.m.VariantManagement.
 sap.ui.define([
+	"sap/ui/core/Element",
+	"sap/ui/core/Lib",
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/base/ManagedObjectModel",
 	"sap/ui/model/Filter",
@@ -46,6 +48,8 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/m/library"
 ], function(
+	Element,
+	Library,
 	JSONModel,
 	ManagedObjectModel,
 	Filter,
@@ -109,6 +113,9 @@ sap.ui.define([
 	// shortcut for sap.m.ListKeyboardMode
 	var ListKeyboardMode = mobileLibrary.ListKeyboardMode;
 
+	// shortcut for sap.m.FlexJustifyContent
+	var FlexJustifyContent = mobileLibrary.FlexJustifyContent;
+
 	// shortcut for sap.ui.core.ValueState
 	var ValueState = coreLibrary.ValueState;
 
@@ -208,7 +215,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Controls the visibility of the 'SaveAs' button
+				 * Controls the visibility of the Save As button.
 				 */
 				showSaveAs: {
 					type: "boolean",
@@ -217,7 +224,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * If set to <code>false</code> neither 'Save As' nor 'Save' buttons on the 'My Views' dialog are visible.
+				 * If set to <code>false</code>, neither the Save As nor the Save button in the My Views dialog is visible.
 				 */
 				creationAllowed: {
 					type: "boolean",
@@ -226,7 +233,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Indicates if the buttons and the complete footer in the <i>My Views</i> dialog are visible.
+				 * Indicates if the buttons and the complete footer in the My Views dialog are visible.
 				 */
 				showFooter: {
 					type: "boolean",
@@ -244,7 +251,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * The title in the 'My Views' popover.
+				 * The title in the My Views popover.
 				 */
 				popoverTitle: {
 					type: "string",
@@ -296,7 +303,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Defines the Apply Automatically text for the standard variant in the <i>Manage Views</i> dialog if the application controls this behavior.
+				 * Defines the Apply Automatically text for the standard variant in the Manage Views dialog if the application controls this behavior.
 				 */
 				_displayTextForExecuteOnSelectionForStandardVariant: {
 					type: "string",
@@ -359,7 +366,7 @@ sap.ui.define([
 			events: {
 
 				/**
-				 * This event is fired when either <i>Save As</i> is triggered from the <i>Save View</i> dialog, or <i>Save</i> from <i>My Views</i>.
+				 * This event is fired when the Save View dialog or the Save As dialog is closed with the Save button.
 				 */
 				save: {
 					parameters: {
@@ -372,7 +379,6 @@ sap.ui.define([
 
 						/**
 						 * Indicates if an existing variant is updated or if a new variant is created.
-						 * Basically 'Save' operation leads to overwrite <code>true</code>, while 'Save As' leads to overwrite <code>false</code>.
 						 */
 						overwrite: {
 							type: "boolean"
@@ -408,6 +414,7 @@ sap.ui.define([
 
 						/**
 						 * Array describing the contexts.
+						 * <b>Note:</b> It is only used internally by the SAPUI5 flexibility layer.
 						 */
 						contexts: {
 							type: "object[]"
@@ -441,7 +448,8 @@ sap.ui.define([
 				manage: {
 					parameters: {
 						/**
-						 * List of changed variants. Each entry contains a 'key' - the variant key and a 'name' - the new title of the variant
+						 * List of changed variants.
+						 * Each entry contains a <code>key</code> (the variant key)  and a <code>name</code> (the new title of the variant).
 						 */
 						renamed: {
 							type: "object[]"
@@ -455,14 +463,16 @@ sap.ui.define([
 						},
 
 						/**
-						 * List of variant keys and the associated Execute on Selection indicator. Each entry contains a 'key' - the variant key and a 'exe' - flag describing the intention
+						 * List of variant keys and the associated Execute on Selection indicator.
+						 * Each entry contains a <code>key</code> (the variant key) and an <code>exe</code> flag describing the intention.
 						 */
 						exe: {
 							type: "object[]"
 						},
 
 						/**
-						 * List of variant keys and the associated favorite indicator. Each entry contains a 'key' - the variant key and a 'visible' - flag describing the intention
+						 * List of variant keys and the associated favorite indicator.
+						 * Each entry contains a <code>key</code> (the variant key) and a <code>visible</code> flag describing the intention.
 						 */
 						fav: {
 							type: "object[]"
@@ -476,7 +486,9 @@ sap.ui.define([
 						},
 
 						/**
-						 * List of variant keys and the associated contexts array. Each entry contains a 'key' - the variant key and a 'contexts' - array describing the contexts
+						 * List of variant keys and the associated contexts array.
+						 * Each entry contains a <code>key</code> (the variant key) and a <code>contexts</code> array describing the contexts.
+						 * <b>Note:</b> It is only used internally by the SAPUI5 flexibility layer.
 						 */
 						contexts: {
 							type: "object[]"
@@ -531,7 +543,7 @@ sap.ui.define([
 	VariantManagement.prototype.init = function() {
 		Control.prototype.init.apply(this, arguments);
 
-		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._oRb = Library.getResourceBundleFor("sap.m");
 
 
         this._oManagedObjectModel = new ManagedObjectModel(this);
@@ -827,7 +839,8 @@ sap.ui.define([
 	VariantManagement.prototype._createInnerModel = function() {
 		var oModel = new JSONModel({
 			showCreateTile: false,
-			isDesignMode: false
+			isDesignMode: false,
+			hasNoData: false
 		});
 		this.setModel(oModel, VariantManagement.INNER_MODEL_NAME);
 	};
@@ -846,6 +859,9 @@ sap.ui.define([
 	VariantManagement.prototype.setDesignMode = function(bValue) {
 		this._setInnerModelProperty("/isDesignMode", bValue);
 	};
+	VariantManagement.prototype.setHasNoData = function(bValue) {
+		this._setInnerModelProperty("/hasNoData", bValue);
+	};
 
 	VariantManagement.prototype._setInnerModelProperty = function(sPropertyPath, vValue) {
 		var oInnerModel = this.getModel(VariantManagement.INNER_MODEL_NAME);
@@ -999,7 +1015,7 @@ sap.ui.define([
 			if (nPos > 0) {
 				sId = sId.substring(0, nPos);
 			}
-			return sap.ui.getCore().byId(sId);
+			return Element.getElementById(sId);
 		}
 
 		return null;
@@ -1192,6 +1208,13 @@ sap.ui.define([
 				path: "/selectedKey",
 				model: "$mVariants"
 			},
+			visible: {
+				path: "/hasNoData",
+				model: VariantManagement.INNER_MODEL_NAME,
+				formatter: function(bValue) {
+					return !bValue;
+				}
+			},
 			itemPress: function(oEvent) {
 				var sSelectionKey = null;
 				if (oEvent && oEvent.getParameters()) {
@@ -1201,21 +1224,31 @@ sap.ui.define([
 					}
 				}
 				if (sSelectionKey) {
-
-					var bTriggerForSameItem = this.getProperty("_selectStategyForSameItem");
-
-					if (bTriggerForSameItem || (!bTriggerForSameItem && (this.getSelectedKey() !== sSelectionKey))) {
-						this.setSelectedKey(sSelectionKey);
-
-						this.fireSelect({
-							key: sSelectionKey
-						});
-					}
+					this.setCurrentVariantKey(sSelectionKey);
 					this.oVariantPopOver.close();
 				}
 			}.bind(this)
 		});
-		this.oVariantList.setNoDataText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA"));
+
+		this.oVariantListInvisibleText = new InvisibleText({
+			text: this._oRb.getText("VARIANT_MANAGEMENT_VIEW_LIST")
+		});
+
+		this.oVariantListInvisibleText.toStatic();
+		this.oVariantList.addAriaLabelledBy(this.oVariantListInvisibleText);
+
+
+		this.oVariantListNoDataText = new Text(this.getId() + "-no-data-text", { text: this._oRb.getText("VARIANT_MANAGEMENT_NODATA") });
+		this.oNodataTextLayout = new HBox(this.getId() + "-no-data", {
+			visible: {
+				path: "/hasNoData",
+				model: VariantManagement.INNER_MODEL_NAME
+			},
+			justifyContent: FlexJustifyContent.Center,
+			enableScrolling: false,
+			fitContainer: true,
+			items: [this.oVariantListNoDataText]
+		});
 
 		var oItemTemplate = new Item({
 			key: "{$mVariants>key}",
@@ -1240,7 +1273,7 @@ sap.ui.define([
 				]
 			}),
 			content: [
-				this.oVariantList
+				this.oVariantList, this.oNodataTextLayout
 			],
 			footer: new OverflowToolbar({
 				content: [
@@ -1289,11 +1322,33 @@ sap.ui.define([
 		this.oVariantPopOver.isPopupAdaptationAllowed = function() {
 			return false;
 		};
-
-		// this.oVariantList.getBinding("items").filter(this._getFilters());
 	};
 
 
+	/**
+	 * Enables the programmatic selection of a variant.
+	 * @public
+	 * @param {string} sKey of variant to be selected. If the passed key doesn't identify a variant, it will be ignored
+	 */
+	VariantManagement.prototype.setCurrentVariantKey = function(sKey) {
+		var oItem = this.getItemByKey(sKey);
+		if (oItem) {
+			var bTriggerForSameItem = this.getProperty("_selectStategyForSameItem");
+
+			if (bTriggerForSameItem || (!bTriggerForSameItem && (this.getSelectedKey() !== sKey))) {
+				this.setSelectedKey(sKey);
+
+				this.setModified(false);
+
+				this.fireSelect({
+					key: sKey
+				});
+			}
+		} else {
+			Log.error("setCurrentVariantKey called with unknown key:'" + sKey + "'");
+		}
+	};
+
 	VariantManagement.prototype._determineEmphasizedFooterButton = function() {
 		if (this.oVariantSaveBtn.getVisible()) {
 			this.oVariantSaveBtn.setType(ButtonType.Emphasized);
@@ -1321,7 +1376,15 @@ sap.ui.define([
 		this._createVariantList();
 		this._oSearchField.setValue("");
 
-		this.oVariantList.getBinding("items").filter(this._getFilters());
+		const oListBinding = this.oVariantList.getBinding("items");
+		oListBinding.attachChange(function(oEvent) {
+			this.setHasNoData(this.oVariantList.getItems().length === 0);
+		}.bind(this));
+		oListBinding.filter(this._getFilters());
+
+		if (this.oVariantList.getItems().length < 1) {
+			this.oVariantListNoDataText.setText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA"));
+		}
 
 		this.oVariantSelectionPage.setShowSubHeader(this.oVariantList.getItems().length > 9);
 
@@ -1356,6 +1419,10 @@ sap.ui.define([
 		});
 
 		oVariantList.getBinding("items").filter(this._getFilters(oFilter));
+
+		if (oVariantList.getItems().length < 1) {
+			this.oVariantListNoDataText.setText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA_FOUND"));
+		}
 	};
 
 	// Save View dialog
@@ -1891,6 +1958,10 @@ sap.ui.define([
 
 		oManagementTable.getBinding("items").filter(aFilters);
 
+        if (this.oManagementTable.getItems().length < 1) {
+			this.oManagementTable.setNoDataText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA_FOUND"));
+		}
+
 		this._bRebindRequired = true;
 	};
 
@@ -1905,7 +1976,8 @@ sap.ui.define([
 				contextualWidth: "Auto",
 				fixedLayout: false,
 				growing: true,
-				keyboardMode: ListKeyboardMode.Edit,
+				noDataText: this._oRb.getText("VARIANT_MANAGEMENT_NODATA"),
+				keyboardMode: ListKeyboardMode.Navigation,
 				columns: [
 					new Column({
 						header: new InvisibleText({
@@ -2326,6 +2398,10 @@ sap.ui.define([
 			}
 		}
 
+        if (this.oManagementTable.getItems().length < 1) {
+			this.oManagementTable.setNoDataText(this._oRb.getText("VARIANT_MANAGEMENT_NODATA"));
+		}
+
 		this.oManagementDialog.open();
 	};
 
@@ -2451,7 +2527,7 @@ sap.ui.define([
 		var sKey = oItem.getKey();
 
 		// do not allow the deletion of the standard
-		if (this.getStandardVariantKey() === sKey) {
+		if (!oItem.getRemove()) {
 			return;
 		}
 
@@ -2622,13 +2698,12 @@ sap.ui.define([
 	};
 
 	VariantManagement.prototype._anyInErrorStateManageTable = function(oManagementTable) {
-		var oInput;
 		var bInError = false;
 
 		if (oManagementTable) {
 			oManagementTable.getItems().some(function(oItem) {
 				if (oItem.getVisible()) {
-					oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
+					var oInput = oItem.getCells()[VariantManagement.COLUMN_NAME_IDX];
 					if (oInput && oInput.getValueState && (oInput.getValueState() === ValueState.Error)) {
 						bInError = true;
 					}
@@ -2897,6 +2972,10 @@ sap.ui.define([
 			this.oVariantInvisibleText.destroy(true);
 			this.oVariantInvisibleText = undefined;
 		}
+		if (this.oVariantListInvisibleText && !this.oVariantListInvisibleText._bIsBeingDestroyed) {
+			this.oVariantListInvisibleText.destroy(true);
+			this.oVariantListInvisibleText = undefined;
+		}
 
 		if (this.oDefault && !this.oDefault._bIsBeingDestroyed) {
 			this.oDefault.destroy();

package/src/sap/m/ViewSettingsCustomItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsCustomTab.js

@@ -20,7 +20,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 			 * @extends sap.ui.core.Item
 			 *
 			 * @author SAP SE
-			 * @version 1.120.6
+			 * @version 1.121.0
 			 *
 			 * @constructor
 			 * @public

package/src/sap/m/ViewSettingsDialog.js

@@ -35,6 +35,7 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/core/StaticArea",
 	"sap/base/Log",
+	"sap/ui/core/library",
 	"sap/ui/thirdparty/jquery",
 	// jQuery Plugin "firstFocusableDomRef"
 	"sap/ui/dom/jquery/Focusable"
@@ -69,6 +70,7 @@ function(
 	BaseObject,
 	StaticArea,
 	Log,
+	coreLibrary,
 	jQuery
 ) {
 	"use strict";
@@ -88,6 +90,9 @@ function(
 	// shortcut for sap.m.ButtonType
 	var ButtonType = library.ButtonType;
 
+	// shortcut for sap.ui.core.TitleLevel
+	var TitleLevel = coreLibrary.TitleLevel;
+
 	var LIST_ITEM_SUFFIX = "-list-item";
 
 	/**
@@ -150,7 +155,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -375,6 +380,8 @@ function(
 				listProp: "title"
 			},
 			selected: {
+			},
+			wrapping: {
 			}
 		}, {
 			tooltip: {}
@@ -574,7 +581,7 @@ function(
 			oList = new List(sListId, this.mToList[sType].listOptions),
 			oGHI = this._createGroupHeaderItem(sType);
 
-		oList.addItem(oGHI);
+		oList.addItemGroup(undefined, oGHI);
 		this[this.mToList[sType].listName] = oList;
 
 		return oList;
@@ -781,7 +788,7 @@ function(
 			if (!oList) {
 				oList = this._createList(sType);
 			} else if (!oList.getItems().length) {
-				oList.addItem(this._createGroupHeaderItem(sType));
+				oList.addItemGroup(undefined, this._createGroupHeaderItem(sType));
 			}
 
 			oList.addItem(oListItem);
@@ -817,7 +824,7 @@ function(
 				oList = this._createList(sType);
 				oList.insertItem(oListItem, iIndex);
 			} else if (!oList.getItems().length) {
-				oList.addItem(this._createGroupHeaderItem(sType));
+				oList.addItemGroup(undefined, this._createGroupHeaderItem(sType));
 				oList.insertItem(oListItem, iIndex + 1);
 			} else {
 				oList.insertItem(oListItem, iIndex);
@@ -1198,7 +1205,7 @@ function(
 	 *
 	 * @override
 	 * @public
-	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item, the item's string key
+	 * @param {sap.m.ViewSettingsItem|sap.ui.core.ID|string} vItemOrKey The selected item, the item's string key
 	 * or the item id
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 */
@@ -1243,7 +1250,7 @@ function(
 	 *
 	 * @override
 	 * @public
-	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item, the item's string key
+	 * @param {sap.m.ViewSettingsItem|sap.ui.core.ID|string} vItemOrKey The selected item, the item's string key
 	 * or the item id
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 */
@@ -1292,7 +1299,7 @@ function(
 	 *
 	 * @override
 	 * @public
-	 * @param {sap.m.ViewSettingsItem|string|null} vItemOrKey The selected item or the item's key string
+	 * @param {sap.m.ViewSettingsItem|sap.ui.core.ID|string|null} vItemOrKey The selected item or the item's key string
 	 * @returns {this} Reference to <code>this</code> for method chaining
 	 */
 	ViewSettingsDialog.prototype.setSelectedPresetFilterItem = function(vItemOrKey) {
@@ -1929,7 +1936,8 @@ function(
 	ViewSettingsDialog.prototype._getTitleLabel = function() {
 		if (this._titleLabel === undefined) {
 			this._titleLabel = new Title(this._sTitleLabelId, {
-				text : this._rb.getText("VIEWSETTINGS_TITLE")
+				text : this._rb.getText("VIEWSETTINGS_TITLE"),
+				level: TitleLevel.H1
 			}).addStyleClass("sapMVSDTitle");
 		}
 		return this._titleLabel;
@@ -1978,9 +1986,9 @@ function(
 	 */
 	ViewSettingsDialog.prototype._getDetailTitleLabel = function() {
 		if (this._detailTitleLabel === undefined) {
-			this._detailTitleLabel = new Title(this.getId() + "-detailtitle",
-				{
-					text : this._rb.getText("VIEWSETTINGS_TITLE_FILTERBY")
+			this._detailTitleLabel = new Title(this.getId() + "-detailtitle", {
+					text : this._rb.getText("VIEWSETTINGS_TITLE_FILTERBY"),
+					level: TitleLevel.H1
 				}).addStyleClass("sapMVSDTitle");
 		}
 		return this._detailTitleLabel;
@@ -2239,7 +2247,8 @@ function(
 				title : ManagedObject.escapeSettingsValue(aSubFilters[i].getText()),
 				type : ListType.Active,
 				selected : aSubFilters[i].getSelected(),
-				tooltip : aSubFilters[i].getTooltip()
+				tooltip : aSubFilters[i].getTooltip(),
+				wrapping: aSubFilters[i].getWrapping()
 			}).data("item", aSubFilters[i]);
 			this._filterDetailList.addItem(oListItem);
 		}
@@ -2295,7 +2304,7 @@ function(
 			ariaLabelledBy: this._ariaSortOrderInvisibleText
 		});
 
-		this._sortOrderList.addItem(new GroupHeaderListItem({title: this._rb.getText("VIEWSETTINGS_SORT_BY")}));
+		this._sortOrderList.addItemGroup(undefined, new GroupHeaderListItem({title: this._rb.getText("VIEWSETTINGS_SORT_BY")}));
 
 		this._sortOrderList.addItem(new StandardListItem({
 			title : this._rb.getText("VIEWSETTINGS_ASCENDING_ITEM")
@@ -2326,14 +2335,15 @@ function(
 
 		this._groupList.destroyItems();
 		if (aGroupItems.length) {
-			this._groupList.addItem(new GroupHeaderListItem({title: sTitleGroupObject}));
+			this._groupList.addItemGroup(undefined, new GroupHeaderListItem({title: sTitleGroupObject}));
 			aGroupItems.forEach(function (oItem) {
 				oListItem = new StandardListItem({
 					id: oItem.getId() + LIST_ITEM_SUFFIX,
 					title: ManagedObject.escapeSettingsValue(oItem.getText()),
 					type: ListType.Active,
 					selected: oItem.getSelected(),
-					tooltip : oItem.getTooltip()
+					tooltip : oItem.getTooltip(),
+					wrapping: oItem.getWrapping()
 				}).data("item", oItem);
 				this._groupList.addItem(oListItem);
 			}, this);
@@ -2361,7 +2371,8 @@ function(
 				id: this._oGroupingNoneItem.getId() + LIST_ITEM_SUFFIX,
 				title: this._oGroupingNoneItem.getText(),
 				type: ListType.Active,
-				selected: this._oGroupingNoneItem.getSelected()
+				selected: this._oGroupingNoneItem.getSelected(),
+				wrapping: this._oGroupingNoneItem.getWrapping()
 			}).data("item", this._oGroupingNoneItem);
 			this._groupList.addItem(oListItem);
 		}
@@ -2394,7 +2405,7 @@ function(
 			ariaLabelledBy: this._ariaGroupOrderInvisibleText
 		});
 
-		this._groupOrderList.addItem(new GroupHeaderListItem({title: this._rb.getText("VIEWSETTINGS_GROUP_BY")}));
+		this._groupOrderList.addItemGroup(undefined, new GroupHeaderListItem({title: this._rb.getText("VIEWSETTINGS_GROUP_BY")}));
 		this._groupOrderList.addItem(new StandardListItem({
 			title : this._rb.getText("VIEWSETTINGS_ASCENDING_ITEM")
 		}).data("item", false).setSelected(true));
@@ -2444,7 +2455,8 @@ function(
 					title: ManagedObject.escapeSettingsValue(oItem.getText()),
 					type: ListType.Active,
 					selected: oItem.getSelected(),
-					tooltip: oItem.getTooltip()
+					tooltip: oItem.getTooltip(),
+					wrapping: oItem.getWrapping()
 				}).data("item", oItem);
 				this._presetFilterList.addItem(oListItem);
 			}, this);
@@ -2462,7 +2474,7 @@ function(
 		this._filterList.destroyItems();
 		aFilterItems = this.getFilterItems();
 
-		this._filterList.addItem(new GroupHeaderListItem({title: sTitleFilterBy}));
+		this._filterList.addItemGroup(undefined, new GroupHeaderListItem({title: sTitleFilterBy}));
 
 		if (aFilterItems.length) {
 			aFilterItems.forEach(function(oItem) {
@@ -2472,6 +2484,7 @@ function(
 						title : ManagedObject.escapeSettingsValue(oItem.getText()),
 						type : ListType.Active,
 						tooltip : oItem.getTooltip(),
+						wrapping: oItem.getWrapping(),
 						press : (function(oItem) {
 							return function(oEvent) {
 								// navigate to details page
@@ -2860,7 +2873,7 @@ function(
 	 *
 	 * @override
 	 * @public
-	 * @param { int| sap.m.ViewSettingsFilterItem | string } vFilterItem The filter item's index, or the item itself, or its id
+	 * @param { int| sap.m.ViewSettingsFilterItem | sap.ui.core.ID } vFilterItem The filter item's index, or the item itself, or its ID
 	 * @returns {sap.m.ViewSettingsFilterItem|null} The removed item or <code>null</code>
 	 */
 	ViewSettingsDialog.prototype.removeFilterItem = function (vFilterItem) {
@@ -2953,7 +2966,7 @@ function(
 
 		if (this.getTitle()) { // custom title
 			oTitleLabel.setText(this.getTitle());
-		} else { // default title
+		} else if (this._hasSubHeader()) { // default title if necessary
 			oTitleLabel.setText(this._rb.getText("VIEWSETTINGS_TITLE"));
 		}
 

package/src/sap/m/ViewSettingsFilterItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsItem.js

@@ -25,7 +25,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item'],
 	 * @extends sap.ui.core.Item
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @constructor
 	 * @public
@@ -40,7 +40,14 @@ sap.ui.define(['./library', 'sap/ui/core/Item'],
 			/**
 			 * Selected state of the item. If set to "true", the item will be displayed as selected in the view settings dialog.
 			 */
-			selected : {type : "boolean", group : "Behavior", defaultValue : false}
+			selected : {type : "boolean", group : "Behavior", defaultValue : false},
+
+			/**
+			 * Defines the wrapping behavior of the title text.
+			 *
+			 * @since 1.121.0
+			 */
+			wrapping : {type : "boolean", group : "Behavior", defaultValue : false}
 		},
 		events : {
 			/**

package/src/sap/m/VisibleItem.js

@@ -21,7 +21,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', "sap/ui/thirdparty/jquery"],
 		 * @extends sap.ui.core.Item
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/WheelSlider.js

@@ -7,6 +7,7 @@
 sap.ui.define([
 	'sap/ui/core/Control',
 	'./WheelSliderRenderer',
+	"sap/ui/core/ControlBehavior",
 	'sap/ui/core/IconPool',
 	'sap/ui/Device',
 	"sap/ui/events/KeyCodes",
@@ -14,7 +15,7 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/core/Configuration"
 ],
-	function(Control, WheelSliderRenderer, IconPool, Device, KeyCodes, Button, jQuery, Configuration) {
+	function(Control, WheelSliderRenderer, ControlBehavior, IconPool, Device, KeyCodes, Button, jQuery, Configuration) {
 		"use strict";
 
 		/**
@@ -29,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public
@@ -103,7 +104,7 @@ sap.ui.define([
 			renderer: WheelSliderRenderer
 		});
 
-		var sAnimationMode = Configuration.getAnimationMode();
+		var sAnimationMode = ControlBehavior.getAnimationMode();
 		var bUseAnimations = sAnimationMode !== Configuration.AnimationMode.none && sAnimationMode !== Configuration.AnimationMode.minimal;
 		var SCROLL_ANIMATION_DURATION = bUseAnimations ? 200 : 0;
 		var LABEL_HEIGHT = 32;

package/src/sap/m/WheelSliderContainer.js

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 *
 		 * @constructor
 		 * @public