@openui5/sap.m 1.98.0 → 1.99.0

package/src/sap/m/messagebundle_zh_CN.properties

@@ -703,8 +703,6 @@ CAROUSEL_POSITION=\u663E\u793A\u9879\u76EE {0}\uFF0C\u5171 {1} \u4E2A
 
 CAROUSEL_PAGE_INDICATOR_TEXT=\u7B2C {0} \u9875\uFF0C\u5171 {1} \u9875
 
-CAROUSEL_ERROR_MESSAGE=\u65E0\u6CD5\u52A0\u8F7D\u5185\u5BB9\u3002
-
 COLON=\:
 
 SEMANTIC_CONTROL_EDIT=\u7F16\u8F91
@@ -817,6 +815,8 @@ TIMEPICKER_TOOLTIP_DOWN=\u5411\u4E0B
 
 BREADCRUMB_LABEL=\u4F4D\u7F6E\u6307\u793A\u8282\u70B9\u8DDF\u8E2A
 
+BREADCRUMB_ITEM_POS={0} of {1}
+
 BREADCRUMB_SELECT_TOOLTIP=\u66F4\u591A
 
 NOTIFICATION_LIST_ITEM_UNREAD=\u901A\u77E5\u672A\u8BFB\u3002
@@ -857,7 +857,7 @@ NUMERICCONTENT_DEVIATION_UP=\u5347\u5E8F
 
 NUMERICCONTENT_DEVIATION_DOWN=\u964D\u5E8F
 
-MASKINPUT_ROLE_DESCRIPTION=Masked Edit
+MASKINPUT_ROLE_DESCRIPTION=\u5C4F\u853D\u5F0F\u7F16\u8F91
 
 MASKINPUT_SCREENREADER_DESCRIPTION=\u805A\u7126\u65F6\uFF0C\u5DF2\u5C4F\u853D\u7684\u8F93\u5165\u5B57\u6BB5\u4F1A\u8FDB\u884C\u683C\u5F0F\u8BBE\u7F6E\u548C\u9884\u586B\u5145\u3002 {0} \u7B26\u53F7\u4FDD\u7559\u7528\u4F5C\u5360\u4F4D\u7B26\u3002 \u5FC5\u987B\u5728\u6B64\u5B57\u6BB5\u4E2D\u8F93\u5165\u7684\u503C\u5177\u6709\u4EE5\u4E0B\u683C\u5F0F\uFF1A{1}\uFF0C\u5176\u4E2D\u6BCF\u4E2A\u7B26\u53F7\u5747\u5BF9\u5E94\u4E8E\u4E00\u6761\u89C4\u5219\u3002 \u89C4\u5219\u662F\u7279\u5B9A\u4F4D\u7F6E\u6240\u5141\u8BB8\u7684\u5B57\u7B26\u96C6\u3002 \u6CA1\u6709\u89C4\u5219\u7684\u7B26\u53F7\u4E3A\u4E0D\u53EF\u6539\u53D8\u7684\u5B57\u7B26\u5E76\u4E14\u662F\u503C\u683C\u5F0F\u8BBE\u7F6E\u7684\u4E00\u90E8\u5206\u3002
 
@@ -965,7 +965,7 @@ ACC_CTR_TYPE_INPUT=\u8F93\u5165
 
 ACC_CTR_TYPE_MULTIINPUT=\u591A\u8F93\u5165
 
-ACC_CTR_TYPE_DATEINPUT=\u65E5\u671F\u9009\u53D6\u5668\u7EC4\u5408\u6846
+ACC_CTR_TYPE_DATEINPUT=\u65E5\u671F\u9009\u53D6\u5668\u8F93\u5165
 
 ACC_CTR_TYPE_DATERANGEINPUT=\u65E5\u671F\u8303\u56F4\u8F93\u5165
 
@@ -1122,7 +1122,7 @@ TABLE_ICON_DESELECT_ALL=\u53D6\u6D88\u9009\u62E9\u6240\u6709\u884C
 
 TABLE_ARIA_LABEL=\u8868\u683C\u5217\u8868
 
-TABLE_CLEARBUTTON_TOOLTIP=Deselect All
+TABLE_CLEARBUTTON_TOOLTIP=\u53D6\u6D88\u5168\u9009
 
 TABLE_CONTAINER_ROLE_DESCRIPTION=\u8868\u683C\u5217\u8868\u5BB9\u5668
 
@@ -1301,9 +1301,12 @@ DYNAMIC_DATE_RANGE_CONFIRM=\u5E94\u7528
 DYNAMIC_DATE_RANGE_CANCEL=\u53D6\u6D88
 
 DYNAMIC_DATE_DATE_FORMAT={0}
+DYNAMIC_DATE_DATETIME_FORMAT={0}
 DYNAMIC_DATE_SPECIFICMONTH_FORMAT={0}
+DYNAMIC_DATE_SPECIFICMONTHINYEAR_FORMAT={0} {1}
 DYNAMIC_DATE_DATERANGE_FORMAT={0} - {1}
 DYNAMIC_DATE_TODAY_FORMAT=\u4ECA\u5929
+DYNAMIC_DATE_DATETIMERANGE_FORMAT={0} - {1}
 DYNAMIC_DATE_YESTERDAY_FORMAT=\u6628\u5929
 DYNAMIC_DATE_TOMORROW_FORMAT=\u660E\u5929
 DYNAMIC_DATE_THISWEEK_FORMAT=\u672C\u5468
@@ -1338,6 +1341,8 @@ DYNAMIC_DATE_NEXTQUARTERS_FORMAT=\u672A\u6765 {0} \u4E2A\u5B63\u5EA6
 DYNAMIC_DATE_NEXTYEARS_FORMAT=\u672A\u6765 {0} \u5E74
 DYNAMIC_DATE_FROM_FORMAT=\u4ECE {0}
 DYNAMIC_DATE_TO_FORMAT=\u5230 {0}
+DYNAMIC_DATE_FROMDATETIME_FORMAT=\u4ECE {0}
+DYNAMIC_DATE_TODATETIME_FORMAT=\u5230 {0}
 DYNAMIC_DATE_YEARTODATE_FORMAT=\u672C\u5E74\u8FC4\u4ECA\u4E3A\u6B62
 DYNAMIC_DATE_DATETOYEAR_FORMAT=\u672C\u5E74\u4ECE\u4ECA\u4EE5\u5F80
 DYNAMIC_DATE_TODAYFROMTO_FORMAT=\u4ECA\u5929 -{0} / +{1} \u5929
@@ -1347,8 +1352,11 @@ DYNAMIC_DATE_QUARTER3_FORMAT=\u7B2C\u4E09\u5B63\u5EA6
 DYNAMIC_DATE_QUARTER4_FORMAT=\u7B2C\u56DB\u5B63\u5EA6
 
 DYNAMIC_DATE_DATE_TITLE=\u65E5\u671F
+DYNAMIC_DATE_DATETIME_TITLE=\u65E5\u671F\u548C\u65F6\u95F4
 DYNAMIC_DATE_SPECIFICMONTH_TITLE=\u6708
+DYNAMIC_DATE_SPECIFICMONTHINYEAR_TITLE=\u5E74\u4E2D\u7684\u6708\u4EFD
 DYNAMIC_DATE_DATERANGE_TITLE=\u4ECE / \u5230
+DYNAMIC_DATE_DATETIMERANGE_TITLE=\u4ECE / \u5230
 DYNAMIC_DATE_TODAY_TITLE=\u4ECA\u5929
 DYNAMIC_DATE_YESTERDAY_TITLE=\u6628\u5929
 DYNAMIC_DATE_TOMORROW_TITLE=\u660E\u5929
@@ -1391,6 +1399,10 @@ DYNAMIC_DATE_QUARTERS=\u5B63\u5EA6
 DYNAMIC_DATE_YEARS=\u5E74
 DYNAMIC_DATE_FROM_TITLE=\u4ECE
 DYNAMIC_DATE_TO_TITLE=\u5230
+DYNAMIC_DATE_FROMDATETIME_TITLE=\u4ECE
+DYNAMIC_DATE_TODATETIME_TITLE=\u5230
+DDR_DATETIMERANGE_FROM_LABEL=\u4ECE
+DDR_DATETIMERANGE_TO_LABEL=\u5230
 DYNAMIC_DATE_YEARTODATE_TITLE=\u672C\u5E74\u8FC4\u4ECA\u4E3A\u6B62
 DYNAMIC_DATE_DATETOYEAR_TITLE=\u672C\u5E74\u4ECE\u4ECA\u4EE5\u5F80
 DYNAMIC_DATE_TODAYFROMTO_TITLE=\u4ECA\u5929 -X / +Y \u5929
@@ -1436,6 +1448,18 @@ table.COLUMNMENU_CONFIRM=\u786E\u5B9A
 
 table.COLUMNMENU_RESET=\u91CD\u7F6E
 
+table.COLUMNMENU_QUICK_SORT=\u5FEB\u901F\u6392\u5E8F\uFF1A
+
+table.COLUMNMENU_SORT_BY=\u6309 {0} \u6392\u5E8F\uFF1A
+
+table.COLUMNMENU_SORT_ASCENDING=\u5347\u5E8F
+
+table.COLUMNMENU_SORT_DESCENDING=\u964D\u5E8F
+
+table.COLUMNMENU_QUICK_GROUP=\u5FEB\u901F\u5206\u7EC4\uFF1A
+
+table.COLUMNMENU_QUICK_TOTAL=\u5FEB\u901F\u603B\u8BA1\uFF1A
+
 IllustratedMessage_TITLE_BeforeSearch=\u8BA9\u6211\u4EEC\u6765\u83B7\u53D6\u4E00\u4E9B\u7ED3\u679C
 
 IllustratedMessage_DESCRIPTION_BeforeSearch=\u9996\u5148\u8981\u63D0\u4F9B\u641C\u7D22\u6761\u4EF6\u3002
@@ -1476,6 +1500,10 @@ IllustratedMessage_TITLE_UnableToLoad=\u65E0\u6CD5\u52A0\u8F7D\u6570\u636E
 
 IllustratedMessage_DESCRIPTION_UnableToLoad=\u68C0\u67E5 Internet \u8FDE\u63A5\u3002\u5982\u679C\u6CA1\u95EE\u9898\uFF0C\u5C1D\u8BD5\u91CD\u65B0\u52A0\u8F7D\u3002\u5982\u679C\u8FD9\u4ECD\u65E0\u52A9\u4E8E\u4E8B\uFF0C\u8BF7\u4E0E\u7BA1\u7406\u5458\u63A5\u6D3D\u3002
 
+IllustratedMessage_TITLE_UnableToLoadImage=\u65E0\u6CD5\u52A0\u8F7D\u56FE\u50CF
+
+IllustratedMessage_DESCRIPTION_UnableToLoadImage=\u65E0\u6CD5\u5728\u6307\u5B9A\u4F4D\u7F6E\u627E\u5230\u56FE\u50CF\uFF0C\u6216\u662F\u670D\u52A1\u5668\u65E0\u54CD\u5E94\u3002
+
 IllustratedMessage_TITLE_UnableToUpload=\u65E0\u6CD5\u4E0A\u8F7D\u6570\u636E
 
 IllustratedMessage_DESCRIPTION_UnableToUpload=\u68C0\u67E5 Internet \u8FDE\u63A5\u3002\u5982\u679C\u8FD9\u65E0\u52A9\u4E8E\u4E8B\uFF0C\u8BF7\u68C0\u67E5\u6587\u4EF6\u683C\u5F0F\u548C\u6587\u4EF6\u5927\u5C0F\u3002\u5426\u5219\u4E0E\u7BA1\u7406\u5458\u8054\u7CFB\u3002

package/src/sap/m/messagebundle_zh_TW.properties

@@ -703,8 +703,6 @@ CAROUSEL_POSITION=\u5DF2\u986F\u793A\u9805\u76EE {0}/{1}
 
 CAROUSEL_PAGE_INDICATOR_TEXT={0}/{1}
 
-CAROUSEL_ERROR_MESSAGE=\u7121\u6CD5\u8F09\u5165\u5167\u5BB9\u3002
-
 COLON=\uFF1A
 
 SEMANTIC_CONTROL_EDIT=\u7DE8\u8F2F
@@ -817,6 +815,8 @@ TIMEPICKER_TOOLTIP_DOWN=\u5411\u4E0B\u9375
 
 BREADCRUMB_LABEL=\u8DEF\u5F91\u6307\u5F15\u8FFD\u8E64
 
+BREADCRUMB_ITEM_POS={0} of {1}
+
 BREADCRUMB_SELECT_TOOLTIP=\u66F4\u591A
 
 NOTIFICATION_LIST_ITEM_UNREAD=\u672A\u8B80\u53D6\u901A\u77E5
@@ -857,7 +857,7 @@ NUMERICCONTENT_DEVIATION_UP=\u5347\u51AA
 
 NUMERICCONTENT_DEVIATION_DOWN=\u964D\u51AA
 
-MASKINPUT_ROLE_DESCRIPTION=Masked Edit
+MASKINPUT_ROLE_DESCRIPTION=\u906E\u7F69\u7DE8\u8F2F
 
 MASKINPUT_SCREENREADER_DESCRIPTION=\u805A\u7126\u4E4B\u5F8C\uFF0C\u7CFB\u7D71\u6703\u5C07\u906E\u7F69\u7684\u8F38\u5165\u6B04\u4F4D\u683C\u5F0F\u5316\u4E26\u9810\u5148\u586B\u5165\u3002 \u7CFB\u7D71\u6703\u4FDD\u7559 {0} \u7B26\u865F\u4F5C\u70BA\u4F4D\u7F6E\u4FDD\u7559\u7B26\u865F\u3002 \u5FC5\u9808\u8F38\u5165\u81F3\u6B64\u6B04\u4F4D\u7684\u503C\u6703\u4F7F\u7528\u4EE5\u4E0B\u683C\u5F0F {1}\uFF0C\u5176\u4E2D\u6BCF\u500B\u7B26\u865F\u7686\u8207\u898F\u5247\u5C0D\u61C9\u3002 \u898F\u5247\u662F\u7CFB\u7D71\u5141\u8A31\u5176\u7279\u6B8A\u4F4D\u7F6E\u7684\u4E00\u7D44\u5B57\u5143\u3002 \u6C92\u6709\u898F\u5247\u7684\u7B26\u865F\u70BA\u56FA\u5B9A\u5B57\u5143\u4EE5\u53CA\u503C\u683C\u5F0F\u7684\u4E00\u90E8\u5206\u3002
 
@@ -965,7 +965,7 @@ ACC_CTR_TYPE_INPUT=\u8F38\u5165
 
 ACC_CTR_TYPE_MULTIINPUT=\u591A\u91CD\u8F38\u5165
 
-ACC_CTR_TYPE_DATEINPUT=\u65E5\u671F\u9078\u64C7\u5668\u4E0B\u62C9\u5F0F\u65B9\u584A
+ACC_CTR_TYPE_DATEINPUT=\u65E5\u671F\u9078\u64C7\u5668\u8F38\u5165
 
 ACC_CTR_TYPE_DATERANGEINPUT=\u65E5\u671F\u7BC4\u570D\u8F38\u5165
 
@@ -1122,7 +1122,7 @@ TABLE_ICON_DESELECT_ALL=\u53D6\u6D88\u9078\u64C7\u6240\u6709\u5217
 
 TABLE_ARIA_LABEL=\u8868\u683C\u6E05\u55AE
 
-TABLE_CLEARBUTTON_TOOLTIP=Deselect All
+TABLE_CLEARBUTTON_TOOLTIP=\u53D6\u6D88\u5168\u9078
 
 TABLE_CONTAINER_ROLE_DESCRIPTION=\u8868\u683C\u6E05\u55AE\u5132\u5B58\u5340
 
@@ -1301,9 +1301,12 @@ DYNAMIC_DATE_RANGE_CONFIRM=\u5957\u7528
 DYNAMIC_DATE_RANGE_CANCEL=\u53D6\u6D88
 
 DYNAMIC_DATE_DATE_FORMAT={0}
+DYNAMIC_DATE_DATETIME_FORMAT={0}
 DYNAMIC_DATE_SPECIFICMONTH_FORMAT={0}
+DYNAMIC_DATE_SPECIFICMONTHINYEAR_FORMAT={0} {1}
 DYNAMIC_DATE_DATERANGE_FORMAT={0} - {1}
 DYNAMIC_DATE_TODAY_FORMAT=\u4ECA\u5929
+DYNAMIC_DATE_DATETIMERANGE_FORMAT={0} - {1}
 DYNAMIC_DATE_YESTERDAY_FORMAT=\u6628\u5929
 DYNAMIC_DATE_TOMORROW_FORMAT=\u660E\u5929
 DYNAMIC_DATE_THISWEEK_FORMAT=\u672C\u9031
@@ -1338,6 +1341,8 @@ DYNAMIC_DATE_NEXTQUARTERS_FORMAT=\u672A\u4F86 {0} \u5B63
 DYNAMIC_DATE_NEXTYEARS_FORMAT=\u672A\u4F86 {0} \u5E74
 DYNAMIC_DATE_FROM_FORMAT=\u958B\u59CB {0}
 DYNAMIC_DATE_TO_FORMAT=\u7D50\u675F {0}
+DYNAMIC_DATE_FROMDATETIME_FORMAT=\u958B\u59CB {0}
+DYNAMIC_DATE_TODATETIME_FORMAT=\u7D50\u675F {0}
 DYNAMIC_DATE_YEARTODATE_FORMAT=\u5E74\u81F3\u65E5
 DYNAMIC_DATE_DATETOYEAR_FORMAT=\u65E5\u81F3\u5E74
 DYNAMIC_DATE_TODAYFROMTO_FORMAT=\u4ECA\u65E5 -{0} / +{1} \u5929
@@ -1347,8 +1352,11 @@ DYNAMIC_DATE_QUARTER3_FORMAT=\u7B2C\u4E09\u5B63
 DYNAMIC_DATE_QUARTER4_FORMAT=\u7B2C\u56DB\u5B63
 
 DYNAMIC_DATE_DATE_TITLE=\u65E5\u671F
+DYNAMIC_DATE_DATETIME_TITLE=\u65E5\u671F\u548C\u6642\u9593
 DYNAMIC_DATE_SPECIFICMONTH_TITLE=\u6708\u4EFD
+DYNAMIC_DATE_SPECIFICMONTHINYEAR_TITLE=\u6708\u4EFD (\u5E74)
 DYNAMIC_DATE_DATERANGE_TITLE=\u81EA/\u81F3
+DYNAMIC_DATE_DATETIMERANGE_TITLE=\u81EA/\u81F3
 DYNAMIC_DATE_TODAY_TITLE=\u4ECA\u5929
 DYNAMIC_DATE_YESTERDAY_TITLE=\u6628\u5929
 DYNAMIC_DATE_TOMORROW_TITLE=\u660E\u5929
@@ -1391,6 +1399,10 @@ DYNAMIC_DATE_QUARTERS=\u5B63
 DYNAMIC_DATE_YEARS=\u5E74
 DYNAMIC_DATE_FROM_TITLE=\u958B\u59CB
 DYNAMIC_DATE_TO_TITLE=\u7D50\u675F
+DYNAMIC_DATE_FROMDATETIME_TITLE=\u958B\u59CB
+DYNAMIC_DATE_TODATETIME_TITLE=\u7D50\u675F
+DDR_DATETIMERANGE_FROM_LABEL=\u958B\u59CB
+DDR_DATETIMERANGE_TO_LABEL=\u7D50\u675F
 DYNAMIC_DATE_YEARTODATE_TITLE=\u5E74\u81F3\u65E5
 DYNAMIC_DATE_DATETOYEAR_TITLE=\u65E5\u81F3\u5E74
 DYNAMIC_DATE_TODAYFROMTO_TITLE=\u4ECA\u5929 - X / +Y \u5929
@@ -1436,6 +1448,18 @@ table.COLUMNMENU_CONFIRM=\u78BA\u5B9A
 
 table.COLUMNMENU_RESET=\u91CD\u8A2D
 
+table.COLUMNMENU_QUICK_SORT=\u5FEB\u901F\u6392\u5E8F\uFF1A
+
+table.COLUMNMENU_SORT_BY=\u6309 {0} \u6392\u5E8F\uFF1A
+
+table.COLUMNMENU_SORT_ASCENDING=\u905E\u589E
+
+table.COLUMNMENU_SORT_DESCENDING=\u905E\u6E1B
+
+table.COLUMNMENU_QUICK_GROUP=\u5FEB\u901F\u5206\u7D44\uFF1A
+
+table.COLUMNMENU_QUICK_TOTAL=\u5FEB\u901F\u7E3D\u8A08\uFF1A
+
 IllustratedMessage_TITLE_BeforeSearch=\u53D6\u5F97\u90E8\u4EFD\u7D50\u679C
 
 IllustratedMessage_DESCRIPTION_BeforeSearch=\u900F\u904E\u63D0\u4F9B\u60A8\u7684\u641C\u5C0B\u6E96\u5247\u958B\u59CB\u3002
@@ -1476,6 +1500,10 @@ IllustratedMessage_TITLE_UnableToLoad=\u7121\u6CD5\u8F09\u5165\u8CC7\u6599
 
 IllustratedMessage_DESCRIPTION_UnableToLoad=\u6AA2\u67E5\u60A8\u7684\u7DB2\u969B\u7DB2\u8DEF\u9023\u7DDA\uFF1B\u82E5\u6B64\u6642\u6C92\u6709\u7DB2\u969B\u7DB2\u8DEF\u9023\u7DDA\uFF0C\u8ACB\u5617\u8A66\u91CD\u65B0\u8F09\u5165\u3002\u82E5\u6C92\u6709\u7372\u5F97\u5354\u52A9\uFF0C\u8ACB\u806F\u7E6B\u7BA1\u7406\u54E1\u3002
 
+IllustratedMessage_TITLE_UnableToLoadImage=\u7121\u6CD5\u8F09\u5165\u5716\u50CF
+
+IllustratedMessage_DESCRIPTION_UnableToLoadImage=\u5728\u6307\u5B9A\u4F4D\u7F6E\u627E\u4E0D\u5230\u5716\u50CF\uFF0C\u6216\u4F3A\u670D\u5668\u6C92\u6709\u56DE\u61C9\u3002
+
 IllustratedMessage_TITLE_UnableToUpload=\u7121\u6CD5\u4E0A\u50B3\u8CC7\u6599
 
 IllustratedMessage_DESCRIPTION_UnableToUpload=\u6AA2\u67E5\u60A8\u7684\u7DB2\u969B\u7DB2\u8DEF\u9023\u7DDA\uFF1B\u82E5\u6C92\u6709\u7372\u5F97\u5354\u52A9\uFF0C\u8ACB\u6AA2\u67E5\u6A94\u6848\u683C\u5F0F\u548C\u6A94\u6848\u5927\u5C0F\uFF0C\u6216\u662F\u806F\u7D61\u7BA1\u7406\u54E1\u3002

package/src/sap/m/p13n/AbstractContainer.js

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 * @experimental Since 1.96.
 	 * @since 1.96
 	 *
@@ -167,9 +167,9 @@ sap.ui.define([
 	 * This method can be used to remove a view from the <code>AbstractContainer</code> instance.
 	 *
 	 * @param {string|sap.m.p13n.AbstractContainerItem} vContainerItem View that is removed
-	 * @param {boolean} bSuppress Supress invalidate
+	 * @param {boolean} bSuppress Suppress invalidate
 	 *
-	 * @returns {sap.m.p13n.AbstractContainer} The <code>AbstractContainer<code> instance
+	 * @returns {this} The <code>AbstractContainer<code> instance
 	 */
 	AbstractContainer.prototype.removeView = function(vContainerItem, bSuppress){
 		var oContainerItem = typeof vContainerItem == "string" ? this.getView(vContainerItem) : vContainerItem;
@@ -185,9 +185,8 @@ sap.ui.define([
 	 * This method can be used to add a view to the <code>AbstractContainer</code> instance.
 	 *
 	 * @param {sap.m.p13n.AbstractContainerItem} vContainerItem <code>AbstractContainerItem</code> that is added
-	 * @param {boolean} bSuppress Supress invalidate
 	 *
-	 * @returns {sap.m.p13n.AbstractContainer} The <code>AbstractContainer<code> instance
+	 * @returns {this} The <code>AbstractContainer<code> instance
 	 */
 	AbstractContainer.prototype.addView = function(vContainerItem) {
 		if (vContainerItem && vContainerItem.getContent() && !vContainerItem.getContent().hasStyleClass("sapUiMAbstractContainerContent")){
@@ -243,7 +242,15 @@ sap.ui.define([
 		this.oLayout.removeAllContent();
 		this.oLayout.addContent(oNewView.getContent());
 
-		this.fireAfterViewSwitch({source: sCurrentViewKey, target: sKey});
+		if (sCurrentViewKey !== sKey) {
+			this.oAfterRenderingDelegate = {
+				onAfterRendering: function () {
+					this.removeEventDelegate(this.oAfterRenderingDelegate);
+					this.fireAfterViewSwitch({source: sCurrentViewKey, target: sKey});
+				}.bind(this)
+			};
+			this.addEventDelegate(this.oAfterRenderingDelegate, this);
+		}
 	};
 
 	/**
@@ -264,7 +271,7 @@ sap.ui.define([
 	/**
 	 * Gets a plain representation of the current views.
 	 *
-	 * @returns {object} The current view aggeregation as map
+	 * @returns {object} The current view aggregation as map
 	 */
 	AbstractContainer.prototype.getViewMap = function() {
 		return this.getViews().map(function(o){

package/src/sap/m/p13n/AbstractContainerItem.js

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element', "sap/ui/core/Control"],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 * @experimental Since 1.96.
 	 	 * @since 1.96
 		 * @ui5-restricted

package/src/sap/m/p13n/BasePanel.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -160,7 +160,7 @@ sap.ui.define([
 	 * @type {sap.m.p13n.Item}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.m.p13n.Item
+	 * @typedef {object} sap.m.p13n.Item
 	 * @property {string} name The unique key of the item
 	 * @property {string} label The label describing the personalization item
 	 * @property {boolean} visible Defines the selection state of the personalization item
@@ -171,8 +171,8 @@ sap.ui.define([
 	 * Sets the personalization state of the panel instance.
 	 *
 	 * @public
-	 * @param {sap.m.p13n.Item} aP13nData An array containing the personalization state that is represented by the <code>BasePanel</code>.
-	 * @returns {sap.m.p13n.BasePanel} The BasePanel instance
+	 * @param {sap.m.p13n.Item[]} aP13nData An array containing the personalization state that is represented by the <code>BasePanel</code>.
+	 * @returns {this} The BasePanel instance
 	 */
 	BasePanel.prototype.setP13nData = function(aP13nData) {
 		this._getP13nModel().setProperty("/items", merge([], aP13nData));
@@ -180,10 +180,10 @@ sap.ui.define([
 	};
 
 	/**
-	 *
+	 * Returns the personalization state that is currently displayed by the <code>BasePanel</code>.
 	 * @public
 	 * @param {boolean} bOnlyActive Determines whether only the present items is included
-	 * @returns {Array} An array containing the personalization state that is currently displayed by the <code>BasePanel</code>
+	 * @returns {sap.m.p13n.Item[]} An array containing the personalization state that is currently displayed by the <code>BasePanel</code>
 	 */
 	BasePanel.prototype.getP13nData = function (bOnlyActive) {
 		var aItems = merge([], this._getP13nModel().getProperty("/items"));

package/src/sap/m/p13n/Container.js

@@ -13,10 +13,8 @@ sap.ui.define([
 	"sap/m/p13n/AbstractContainerItem",
 	"sap/ui/Device",
 	"sap/m/library",
-	"sap/m/StandardListItem",
-	"sap/m/CustomListItem",
-	"sap/ui/core/Control"
-], function (AbstractContainer, Bar, Button, List, IconTabBar, IconTabFilter, ContainerItem, Device, mLibrary, StandardListItem, CustomListItem, Control) {
+	"sap/m/StandardListItem"
+], function (AbstractContainer, Bar, Button, List, IconTabBar, IconTabFilter, ContainerItem, Device, mLibrary, StandardListItem) {
 	"use strict";
 
 	// shortcut for sap.m.ButtonType
@@ -39,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -129,7 +127,6 @@ sap.ui.define([
 		}
 		var oParent = this.getParent();
 		if (oParent && oParent.isA("sap.ui.core.Control")){
-			oParent.focus();
 			oParent.invalidate();
 
 			// invalidate dependents as well
@@ -142,7 +139,8 @@ sap.ui.define([
 				});
 			}
 		}
-		this.oLayout.setShowHeader(sKey !== this.DEFAULT_KEY); //Don't show header in default view (avoid empty space),
+		this.oLayout.setShowHeader(sKey !== this.DEFAULT_KEY); //Don't show header in default view
+		this.oLayout.setShowFooter(sKey !== this.DEFAULT_KEY); //Don't show footer in default view
 		this._getTabBar().setSelectedKey(sKey);
 		this._getNavBackBtn().setVisible(sKey !== this.DEFAULT_KEY);
 		this._getNavBackBtn().setText((this.getView(sKey) && this.getView(sKey).getText()) || sKey);
@@ -151,18 +149,19 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	Container.prototype.addView = function (oContainerItem) {
+	Container.prototype.addView = function (vContainerItem) {
+		this._addToNavigator(typeof vContainerItem == "string" ? this.getView(vContainerItem) : vContainerItem);
 		AbstractContainer.prototype.addView.apply(this, arguments);
-		this._addToNavigator(oContainerItem);
 		return this;
 	};
 
 	/**
 	* @override
 	*/
-	Container.prototype.removeView = function (oContainerItem) {
+	Container.prototype.removeView = function (vContainerItem) {
+		this._removeFromNavigator(typeof vContainerItem == "string" ? this.getView(vContainerItem) : vContainerItem);
 		AbstractContainer.prototype.removeView.apply(this, arguments);
-		this._removeFromNavigator(oContainerItem);
+		return this;
 	};
 
 	/*

package/src/sap/m/p13n/GroupPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -54,10 +54,10 @@ sap.ui.define([
 	 * @type {sap.m.p13n.GroupItem}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.m.p13n.GroupItem
-	 * @property {String} name The unique key of the item
-	 * @property {String} label The label describing the personalization item
-	 * @property {Boolean} grouped Defines the grouping state of the personalization item
+	 * @typedef {object} sap.m.p13n.GroupItem
+	 * @property {string} name The unique key of the item
+	 * @property {string} label The label describing the personalization item
+	 * @property {boolean} grouped Defines the grouping state of the personalization item
 	 *
 	 * @public
 	 */

package/src/sap/m/p13n/Popup.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @experimental Since 1.97.

package/src/sap/m/p13n/QueryPanel.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/layout/Grid", "./BasePanel", "sap/ui/core/Item", "sap/m/CustomListItem", "sap/m/Select", "sap/m/List", "sap/m/HBox", "sap/m/library", "sap/m/Button"
-], function (Grid, BasePanel, Item, CustomListItem, Select, List, HBox, mLibrary, Button) {
+	"sap/ui/layout/Grid", "./BasePanel", "sap/ui/core/Item", "sap/m/CustomListItem", "sap/m/Select", "sap/m/List", "sap/m/HBox", "sap/m/library", "sap/m/Button", "sap/base/util/merge"
+], function (Grid, BasePanel, Item, CustomListItem, Select, List, HBox, mLibrary, Button, merge) {
 	"use strict";
 
 
@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -82,18 +82,57 @@ sap.ui.define([
 		return this;
 	};
 
+	QueryPanel.prototype.getP13nData = function (bOnlyActive) {
+		var aItems = [];
+		this._oListControl.getItems().forEach(function (oItem) {
+			var sKey = oItem.getContent()[0].getContent()[0]._key;
+			if (sKey) {
+				var oField = this._getP13nModel().getProperty("/items").find(function (o) {
+					return o.name == sKey;
+				});
+				aItems.push(oField);
+			}
+		}.bind(this));
+
+		if (!bOnlyActive) {
+			this._getP13nModel().getProperty("/items").forEach(function(oItem){
+				if (aItems.indexOf(oItem) === -1) {
+					aItems.push(oItem);
+				}
+			});
+		}
+
+		return merge([], aItems);
+	};
+
+	QueryPanel.prototype._allEntriesUsed = function() {
+		return this.getP13nData().length === this.getP13nData(true).length;
+	};
+
 	QueryPanel.prototype._moveTableItem = function (oItem, iNewIndex) {
-		BasePanel.prototype._moveTableItem.apply(this, arguments);
-		this._updateEnableOfMoveButtons(oItem, false);
-		this._oListControl.removeItem(oItem);
-		this._oListControl.insertItem(oItem, iNewIndex);
+		// Rules for the movement for the $_none row:
+		// 1) disable the $_none row for reordering
+		// 2) in case all entries are used there is no $_none row and the movement is allowed
+		if (this._oListControl.getItems().indexOf(oItem) !== (this._oListControl.getItems().length - 1)  || this._allEntriesUsed()) {
+			this._oListControl.removeItem(oItem);
+			this._oListControl.insertItem(oItem, iNewIndex);
+
+			this._updateEnableOfMoveButtons(oItem, false);
+
+			this.fireChange({
+				reason: this.CHANGE_REASON_MOVE,
+				item: this._getModelEntry(oItem)
+			});
+		}
 	};
 
 	QueryPanel.prototype._updateEnableOfMoveButtons = function(oTableItem, bFocus) {
 		BasePanel.prototype._updateEnableOfMoveButtons.apply(this, arguments);
 
-		//The last item is always the "$_none" field, check if its the item before, if yes do not allow to reorder it below
-		if (this._oListControl.getItems().indexOf(oTableItem) === (this._oListControl.getItems().length - 2)) {
+		//The last item is always the "$_none" field
+		// 1) check if its the item before, if yes do not allow to reorder it below
+		// 2) Also check the case if all entries are used --> then there is no $_none row and the buttons can be enabled.
+		if (this._oListControl.getItems().indexOf(oTableItem) === (this._oListControl.getItems().length - 2) && !this._allEntriesUsed()) {
 			this._getMoveDownButton().setEnabled(false);
 		}
 	};
@@ -138,21 +177,12 @@ sap.ui.define([
 		return aAvailableItems;
 	};
 
-	QueryPanel.prototype._getMoveDownButton = function() {
-		var oMoveBtn = BasePanel.prototype._getMoveDownButton.apply(this, arguments);
-		oMoveBtn.setIcon("sap-icon://navigation-down-arrow");
-		return oMoveBtn;
-	};
-
-	QueryPanel.prototype._getMoveUpButton = function() {
-		var oMoveBtn = BasePanel.prototype._getMoveUpButton.apply(this, arguments);
-		oMoveBtn.setIcon("sap-icon://navigation-up-arrow");
-		return oMoveBtn;
-	};
-
 	QueryPanel.prototype._addQueryRow = function (oItem) {
 
-		if (this.getQueryLimit() > -1 && this.getQueryLimit() === this._oListControl.getItems().length) {
+		var bLimitedQueries = this.getQueryLimit() > -1;
+		var bQueryLimitReached = this.getQueryLimit() === this._oListControl.getItems().length;
+
+		if ((bLimitedQueries && bQueryLimitReached) || this._allEntriesUsed()) {
 			return;
 		}
 
@@ -265,9 +295,15 @@ sap.ui.define([
 					icon: "sap-icon://decline",
 					press: function (oEvt) {
 						var oRow = oEvt.getSource().getParent().getParent().getParent();
+
+						var iQueries = this._oListControl.getItems().length;
+						//A new row with (none) needs to be created if either no row is left, or if the last potential row
+						//has been removed, as no row will be created if every possible key has been used
+						var bNewRowRequired = iQueries === 1 || iQueries == this.getP13nData(true).length;
+
 						this._oListControl.removeItem(oRow);
 						this._updatePresence(oRow.getContent()[0].getContent()[0]._key, false, undefined);
-						if (this._oListControl.getItems().length === 0) {
+						if (bNewRowRequired) {
 							this._addQueryRow();
 						} else {
 							//In case an item has been removed, focus the Select control of the new 'none' row
@@ -297,11 +333,6 @@ sap.ui.define([
 			aRelevant[0][this.PRESENCE_ATTRIBUTE] = bAdd;
 		}
 
-		if (iNewIndex !== undefined) {
-			var iOldIndex = aItems.indexOf(aRelevant[0]);
-			aItems.splice(iNewIndex, 0, aItems.splice(iOldIndex, 1)[0]);
-		}
-
 		this._getP13nModel().setProperty("/items", aItems);
 
 		this.fireChange({

package/src/sap/m/p13n/SelectionPanel.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -266,7 +266,7 @@ sap.ui.define([
 	/**
 	 * Sets the personalization state of the panel instance.
 	 * @public
-	 * @param {sap.m.p13n.Item} aP13nData An array containing the personalization state that is represented by the <code>SelectionPanel</code>.
+	 * @param {sap.m.p13n.Item[]} aP13nData An array containing the personalization state that is represented by the <code>SelectionPanel</code>.
 	 */
 	SelectionPanel.prototype.setP13nData = function() {
 		this._oListControl.removeSelections();

package/src/sap/m/p13n/SortPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.
@@ -44,11 +44,11 @@ sap.ui.define([
 	 * @type {sap.m.p13n.SortItem}
 	 * @static
 	 * @constant
-	 * @typedef {Object} sap.m.p13n.SortItem
-	 * @property {String} name The unique key of the item
-	 * @property {String} label The label describing the personalization item
-	 * @property {Boolean} sorted Defines the sorting state of the personalization item
-	 * @property {Boolean} descending Defines the descending state of the personalization item
+	 * @typedef {object} sap.m.p13n.SortItem
+	 * @property {string} name The unique key of the item
+	 * @property {string} label The label describing the personalization item
+	 * @property {boolean} sorted Defines the sorting state of the personalization item
+	 * @property {boolean} descending Defines the descending state of the personalization item
 	 *
 	 * @public
 	 */

package/src/sap/m/plugins/ColumnResizer.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @since 1.91

package/src/sap/m/plugins/DataStateIndicator.js

@@ -19,7 +19,7 @@ sap.ui.define(["./PluginBase", "sap/ui/core/Core", "sap/ui/base/ManagedObjectObs
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @since 1.73

package/src/sap/m/plugins/PasteProvider.js

@@ -28,7 +28,7 @@ sap.ui.define(["./PluginBase", "sap/ui/core/Core", "sap/ui/core/util/PasteHelper
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @public
 	 * @since 1.91