@openui5/sap.ui.fl 1.114.0 → 1.114.2

package/src/sap/ui/fl/library.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * changes or other flex objects that need processing. If there is nothing to
 	 * process, any further flex processing is stopped to avoid runtime impact for end users.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @since 1.44
 	 * @namespace
 	 * @name sap.ui.fl.initial
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.initial._internal</code> namespace contains internals that are used
 	 * during app startup, e.g. to load the flex data and resolve or bootstrap the <code>sap.ui.fl.apply</code> for applying changes.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.initial._internal
 	 * @private
@@ -56,7 +56,7 @@ sap.ui.define([
 	 * The <code>Configuration</code> is not limited to these connectors and can include every connector extending <code>sap.ui.fl.interfaces.BaseLoadConnector</code>
 	 * and <code>sap.ui.fl.write.connectors.BaseConnector</code>.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.initial._internal.connectors
 	 * @private
@@ -66,7 +66,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.apply</code> namespace contains all code to apply flexibility changes on application startup.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply
 	 * @private
@@ -77,7 +77,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.apply.api</code> namespace contains public APIs that can be used
 	 * during app startup, e.g. to wait for changes to be applied or to access the current variant and switch variants.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply.api
 	 * @private
@@ -86,7 +86,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal
 	 * @private
@@ -95,7 +95,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes
 	 * @private
@@ -104,7 +104,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor
 	 * @private
@@ -113,7 +113,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.app
 	 * @private
@@ -122,7 +122,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.fiori
 	 * @private
@@ -131,7 +131,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.ovp
 	 * @private
@@ -140,7 +140,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.changes.descriptor.ui5
 	 * @private
@@ -149,7 +149,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexObjects
 	 * @private
@@ -158,7 +158,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState
 	 * @private
@@ -167,7 +167,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.changes
 	 * @private
@@ -176,7 +176,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.compVariants
 	 * @private
@@ -185,7 +185,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.controlVariants
 	 * @private
@@ -194,7 +194,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.flexState.UI2Personalization
 	 * @private
@@ -203,7 +203,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.preprocessors
 	 * @private
@@ -212,7 +212,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.apply._internal.variants
 	 * @private
@@ -221,7 +221,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.support
 	 * @private
@@ -230,7 +230,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.support.api
 	 * @private
@@ -239,7 +239,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.support._internal
 	 * @private
@@ -248,7 +248,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.variants.context
 	 * @private
@@ -259,7 +259,7 @@ sap.ui.define([
 	 * Namespace containing interfaces and base classes of connectors to implement a connection to a specific end point
 	 * capable of storing flexibility entities as well as providing information about its capabilities.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.connectors
 	 * @deprecated since 1.87. Use a implementing class in the {@link sap.ui.fl.write.api.connectors} namespace instead.
@@ -270,7 +270,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.variants</code> namespace contains the {@link sap.ui.fl.variants.VariantManagement} control and its internals.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @public
 	 * @name sap.ui.fl.variants
@@ -281,7 +281,7 @@ sap.ui.define([
 	 * create, update, and reset flex objects. Additional common functionality needed
 	 * by personalization dialogs or tools like key user adaptation are part of the namespace.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write
 	 * @public
@@ -290,7 +290,7 @@ sap.ui.define([
 	/**
 	 * The <code>sap.ui.fl.write.api</code> namespace contains public APIs to work with flex objects.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write.api
 	 * @public
@@ -300,7 +300,7 @@ sap.ui.define([
 	 * Namespace containing interfaces and base classes of connectors to implement a connection to a specific end point
 	 * capable of storing flexibility entities as well as providing information about its capabilities.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write.api.connectors
 	 * @private
@@ -309,7 +309,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal
 	 * @private
@@ -318,7 +318,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.appVariant
 	 * @private
@@ -329,7 +329,7 @@ sap.ui.define([
 	 * Namespace containing all types of connectors to write flex data. The usage of the connectors is restricted to the
 	 * <code>sap.ui.fl</code> library.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.connectors
 	 * @private
@@ -338,7 +338,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.extensionPoint
 	 * @private
@@ -347,7 +347,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.fieldExtensibility
 	 * @private
@@ -356,7 +356,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.flexState
 	 * @private
@@ -365,7 +365,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write._internal.flexState.compVariants
 	 * @private
@@ -374,7 +374,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.write.connectors
 	 * @private
@@ -383,7 +383,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.changeHandler
 	 * @private
@@ -394,7 +394,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.interfaces</code> namespace contains only interface jsdoc descriptions.
 	 * It does not contain running code.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.interfaces
 	 * @private
@@ -403,7 +403,7 @@ sap.ui.define([
 
 	/**
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.interfaces.delegate
 	 * @private
@@ -414,7 +414,7 @@ sap.ui.define([
 	 * The <code>sap.ui.fl.interfaces</code> namespace contains only interface jsdoc descriptions.
 	 * It does not contain running code.
 	 *
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @namespace
 	 * @name sap.ui.fl.registry
 	 * @private
@@ -473,11 +473,11 @@ sap.ui.define([
 	 * @alias sap.ui.fl
 	 * @author SAP SE
 	 * @public
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 */
 	var thisLib = sap.ui.getCore().initLibrary({
 		name: "sap.ui.fl",
-		version: "1.114.0",
+		version: "1.114.2",
 		controls: [
 			"sap.ui.fl.variants.VariantManagement",
 			"sap.ui.fl.util.IFrame"

package/src/sap/ui/fl/messagebundle.properties

@@ -225,4 +225,7 @@ CAP_ERR_WHITESPACE=Name must not contain whitespace
 BUSINESS_OBJECT_NODE_TITLE=Available Business Object Nodes:
 
 #XTXT: Error message when change could not be applied because of open dependencies
-MSG_DEPENDENT_CHANGE_ERROR=The following change cannot be applied: {0}.\n This is caused by the following open dependencies: {1}
+MSG_DEPENDENT_CHANGE_ERROR=The following change cannot be applied: {0}.\n This is caused by the following open dependencies: {1}
+
+#XTIT: Context-Based Adaptation Title of adaptation which is created during migration for a role
+CBA_MIGRATED_ADAPTATION_TITLE={0} (Migrated from restricted view)

package/src/sap/ui/fl/requireAsync.js

@@ -23,6 +23,12 @@ sap.ui.define([
 	 * @alias module:sap/ui/fl/requireAsync
 	 */
 	return function(sModuleName) {
+		// shortcut needed because the requireAsync does a setTimeout if the module is already loaded
+		// this setTimeout will affect our promise chains in a bad way
+		var oAlreadyLoadedModule = sap.ui.require(sModuleName);
+		if (oAlreadyLoadedModule) {
+			return Promise.resolve(oAlreadyLoadedModule);
+		}
 		//TODO: get rid of require async as soon as sap.ui.require has learned Promises as return value
 		return new Promise(function(fnResolve, fnReject) {
 			sap.ui.require([sModuleName], function(oModule) {

package/src/sap/ui/fl/support/_internal/getChangeDependencies.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getChangeDependencies
 	 * @since 1.98
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster", {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	return Controller.extend("sap.ui.fl.support.apps.contentbrowser.controller.Layers", {

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	var LrepConnector = {};

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @experimental Since 1.45
 	 */
 	var DataUtils = {

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function (MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.114.0
+		 * @version 1.114.2
 		 * @experimental Since 1.45
 		 */
 	var ErrorUtils = {};

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @experimental
 	 * @since 1.91

package/src/sap/ui/fl/variants/VariantModel.js

@@ -27,6 +27,7 @@ sap.ui.define([
 	"sap/ui/fl/LayerUtils",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/write/api/ContextBasedAdaptationsAPI",
 	"sap/ui/model/json/JSONModel"
 ], function(
 	_omit,
@@ -51,6 +52,7 @@ sap.ui.define([
 	LayerUtils,
 	Utils,
 	Settings,
+	ContextBasedAdaptationsAPI,
 	JSONModel
 ) {
 	"use strict";
@@ -297,7 +299,7 @@ sap.ui.define([
 	 * @class Variant model implementation for JSON format.
 	 * @extends sap.ui.model.json.JSONModel
 	 * @author SAP SE
-	 * @version 1.114.0
+	 * @version 1.114.2
 	 * @param {object} oData - Either the URL where to load the JSON from or a JS object
 	 * @param {object} mPropertyBag - Map of properties required for the constructor
 	 * @param {sap.ui.fl.FlexController} mPropertyBag.flexController - <code>FlexController</code> instance for the component which uses the variant model
@@ -670,6 +672,7 @@ sap.ui.define([
 			variantName: mPropertyBag.title,
 			contexts: mPropertyBag.contexts,
 			layer: mPropertyBag.layer,
+			adaptationId: mPropertyBag.adaptationId,
 			reference: oSourceVariant.getFlexObjectMetadata().reference,
 			generator: mPropertyBag.generator,
 			variantManagementReference: mPropertyBag.variantManagementReference
@@ -709,6 +712,17 @@ sap.ui.define([
 		if (mPropertyBag.currentVariantComparison === 1) {
 			mPropertyBag.sourceVariantSource = this.getVariant(oSourceVariant.instance.getVariantReference());
 		}
+		var mContextBasedAdaptationBag = {
+			layer: mPropertyBag.layer,
+			control: this.oAppComponent,
+			reference: this.sFlexReference
+		};
+		var bHasAdaptationsModel = ContextBasedAdaptationsAPI.hasAdaptationsModel(mContextBasedAdaptationBag);
+		if (bHasAdaptationsModel) {
+			mPropertyBag.adaptationId = ContextBasedAdaptationsAPI.getDisplayedAdaptationId(mContextBasedAdaptationBag);
+		} else {
+			_omit(mPropertyBag, "adaptationId");
+		}
 		var oDuplicateVariant = {
 			instance: createNewVariant(oSourceVariant.instance, mPropertyBag),
 			controlChanges: aVariantChanges,
@@ -948,12 +962,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Sets the variant properties and adds a variant change
+	 * Sets the variant properties and creates a variant change
 	 * @param {string} sVariantManagementReference - Variant management reference
 	 * @param {object} mPropertyBag - Map of properties
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation ID to set which overrules the currently display adaptation
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created Change object
 	 */
-	VariantModel.prototype.addVariantChange = function(sVariantManagementReference, mPropertyBag) {
+	VariantModel.prototype.createVariantChange = function(sVariantManagementReference, mPropertyBag) {
 		var mAdditionalChangeContent = this.setVariantProperties(sVariantManagementReference, mPropertyBag);
 
 		var mNewChangeData = {};
@@ -968,6 +983,20 @@ sap.ui.define([
 		mNewChangeData.layer = mPropertyBag.layer;
 		mNewChangeData.generator = mPropertyBag.generator;
 
+		//add adaptationId
+		if (mPropertyBag.adaptationId !== undefined) {
+			mNewChangeData.adaptationId = mPropertyBag.adaptationId;
+		} else {
+			var mContextBasedAdaptationBag = {
+				layer: mPropertyBag.layer,
+				control: mPropertyBag.appComponent,
+				reference: this.sFlexReference
+			};
+			if (ContextBasedAdaptationsAPI.hasAdaptationsModel(mContextBasedAdaptationBag)) {
+				mNewChangeData.adaptationId = ContextBasedAdaptationsAPI.getDisplayedAdaptationId(mContextBasedAdaptationBag);
+			}
+		}
+
 		if (mPropertyBag.changeType === "setDefault") {
 			mNewChangeData.fileType = "ctrl_variant_management_change";
 			mNewChangeData.selector = JsControlTreeModifier.getSelector(sVariantManagementReference, mPropertyBag.appComponent);
@@ -986,6 +1015,18 @@ sap.ui.define([
 		mUpdateVariantsStateParams.changeContent = oChange.convertToFileContent();
 		//update variants state and write change to ChangePersistence
 		VariantManagementState.updateChangesForVariantManagementInMap(mUpdateVariantsStateParams);
+		return oChange;
+	};
+
+	/**
+	 * Sets the variant properties and adds a variant change
+	 * @param {string} sVariantManagementReference - Variant management reference
+	 * @param {object} mPropertyBag - Map of properties
+	 * @param {string} [mPropertyBag.adaptationId] - Adaptation ID to set which overrules the currently display adaptation
+	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created Change object
+	 */
+	VariantModel.prototype.addVariantChange = function(sVariantManagementReference, mPropertyBag) {
+		var oChange = this.createVariantChange(sVariantManagementReference, mPropertyBag);
 		this.oChangePersistence.addDirtyChange(oChange);
 
 		return oChange;
@@ -1450,6 +1491,36 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	function resolveTitleBindingsAndCreateVariantChanges(oVariantManagementControl, sVariantManagementReference) {
+		this.oData[sVariantManagementReference].variants.forEach(function(oVariant) {
+			// Find model and key from patterns like {i18n>TextKey} - only named resource models are supported
+			var aMatches = oVariant.title && oVariant.title.match(/{(\w+)>(\w+)}/);
+			if (aMatches) {
+				var sModelName = aMatches[1];
+				var sKey = aMatches[2];
+				var oModel = oVariantManagementControl.getModel(sModelName);
+				if (oModel) {
+					var sResolvedTitle = oModel.getResourceBundle().getText(sKey);
+					var mChangeProperties = {
+						variantReference: oVariant.key,
+						changeType: "setTitle",
+						title: sResolvedTitle,
+						originalTitle: oVariant.originalTitle,
+						layer: oVariant.layer,
+						appComponent: this.oAppComponent
+					};
+					this.createVariantChange(sVariantManagementReference, mChangeProperties);
+				} else {
+					// Wait for model to be assigned and try again
+					oVariantManagementControl.attachEventOnce(
+						"modelContextChange",
+						resolveTitleBindingsAndCreateVariantChanges.bind(this, oVariantManagementControl, sVariantManagementReference)
+					);
+				}
+			}
+		}.bind(this));
+	}
+
 	VariantModel.prototype.registerToModel = function(oVariantManagementControl) {
 		var sVariantManagementReference = this.getVariantManagementReferenceForControl(oVariantManagementControl);
 
@@ -1462,6 +1533,9 @@ sap.ui.define([
 		// only attachVariantApplied will set this to true
 		this.oData[sVariantManagementReference].showExecuteOnSelection = false;
 
+		// replace bindings in titles with the resolved texts
+		resolveTitleBindingsAndCreateVariantChanges.call(this, oVariantManagementControl, sVariantManagementReference);
+
 		// attach/detach events on control
 		// select event
 		oVariantManagementControl.attachEvent("select", {