diff --git a/arkui/ace_engine/native/drag_and_drop.h b/arkui/ace_engine/native/drag_and_drop.h
index a006c72b7f750430aeb26d114416923ab9fa4c2b..15de9f9acab716dd4571d9c8ac07a3bb738d09ad 100644
--- a/arkui/ace_engine/native/drag_and_drop.h
+++ b/arkui/ace_engine/native/drag_and_drop.h
@@ -425,8 +425,8 @@ float OH_ArkUI_DragEvent_GetVelocity(ArkUI_DragEvent* event);
* @brief Obtains the pressed status of modifier keys from a drag event.
*
* @param event Indicates the pointer to an ArkUI_DragEvent object.
- * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys that are currently pressed.
- * The application can determine the pressed modifier keys through bitwise operations.
+ * @param keys {@link ArkUI_ModifierKeyName} Indicates the returned combination of modifier keys that are
+ * currently pressed. The application can determine the pressed modifier keys through bitwise operations.
* @return Returns the result code.
* Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful.
* Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs.
@@ -898,35 +898,6 @@ int32_t OH_ArkUI_NotifyDragResult(int32_t requestIdentify, ArkUI_DragResult resu
*/
int32_t OH_ArkUI_NotifyDragEndPendingDone(int32_t requestIdentify);
-/**
- * @brief Use this method to obtain the application bundle name of the drag-and-drop initiator, you need
- * to pass a character array for receiving the string and explicitly specify the array length. It is
- * recommended that the array length be no less than 128 characters. If the length cannot accommodate
- * the actual bundle name length, the ERROR result will be returned.
- *
- * @param event Indicates the pointer to an ArkUI_DragEvent object.
- * @param bundleName A string array used to receive the source application's bundle name.
- * @param length Use this to explicitly specify the length of the incoming string array.
- * It is recommended to be bigger than 128.
- * @return Returns the result code.
- * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful.
- * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs.
- * @since 20
- */
-ArkUI_ErrorCode OH_ArkUI_DragEvent_GetDragSource(ArkUI_DragEvent* event, char *bundleName, int32_t length);
-
-/**
- * @brief Call this method to determine whether the current drag and drop operation is cross-device.
- *
- * @param event Indicates the pointer to an ArkUI_DragEvent object.
- * @param isRemote Boolean pointer to receive the result.
- * @return Returns the result code.
- * Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful.
- * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs.
- * @since 20
- */
-ArkUI_ErrorCode OH_ArkUI_DragEvent_IsRemote(ArkUI_DragEvent* event, bool* isRemote);
-
/**
* @brief Sets whether to enable the display of a disallow status icon.
*
diff --git a/arkui/ace_engine/native/libace.ndk.json b/arkui/ace_engine/native/libace.ndk.json
index 7a15d4e4f25e8fad68814e6c38199ed4a42e7213..5f40fa600bd360df1e608d41cbaf0265d3c37d0d 100644
--- a/arkui/ace_engine/native/libace.ndk.json
+++ b/arkui/ace_engine/native/libace.ndk.json
@@ -121,115 +121,107 @@
},
{
"first_introduced": "12",
- "name": "OH_NativeXComponent_RegisterUIInputEventCallback"
- },
- {
- "first_introduced": "12",
- "name": "OH_ArkUI_UIInputEvent_GetType"
+ "name": "OH_ArkUI_GetNodeHandleFromNapiValue"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_UIInputEvent_GetEventTime"
+ "name": "OH_ArkUI_GestureEvent_GetActionType"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetX"
+ "name": "OH_ArkUI_GestureEvent_GetRawInputEvent"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetY"
+ "name": "OH_ArkUI_LongPress_GetRepeatCount"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetWindowX"
+ "name": "OH_ArkUI_PanGesture_GetVelocity"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetWindowY"
+ "name": "OH_ArkUI_PanGesture_GetVelocityY"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetDisplayX"
+ "name": "OH_ArkUI_PanGesture_GetVelocityX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PointerEvent_GetDisplayY"
+ "name": "OH_ArkUI_PanGesture_GetOffsetX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_AxisEvent_GetVerticalAxisValue"
+ "name": "OH_ArkUI_PanGesture_GetOffsetY"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_AxisEvent_GetHorizontalAxisValue"
+ "name": "OH_ArkUI_SwipeGesture_GetAngle"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_AxisEvent_GetPinchAxisScaleValue"
- },
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_AxisEvent_GetAxisAction"
+ "name": "OH_ArkUI_SwipeGesture_GetVelocity"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_GetNodeHandleFromNapiValue"
+ "name": "OH_ArkUI_RotationGesture_GetAngle"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_GestureEvent_GetActionType"
+ "name": "OH_ArkUI_PinchGesture_GetScale"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_GestureEvent_GetRawInputEvent"
+ "name": "OH_ArkUI_PinchGesture_GetCenterX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_LongPress_GetRepeatCount"
+ "name": "OH_ArkUI_PinchGesture_GetCenterY"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PanGesture_GetVelocity"
+ "name": "OH_NativeXComponent_RegisterSurfaceShowCallback"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PanGesture_GetVelocityY"
+ "name": "OH_NativeXComponent_RegisterSurfaceHideCallback"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PanGesture_GetVelocityX"
+ "name": "OH_NativeXComponent_RegisterUIInputEventCallback"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PanGesture_GetOffsetX"
+ "name": "OH_ArkUI_UIInputEvent_GetType"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PanGesture_GetOffsetY"
+ "name": "OH_ArkUI_UIInputEvent_GetEventTime"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_SwipeGesture_GetAngle"
+ "name": "OH_ArkUI_PointerEvent_GetX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_SwipeGesture_GetVelocity"
+ "name": "OH_ArkUI_PointerEvent_GetY"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_RotationGesture_GetAngle"
+ "name": "OH_ArkUI_PointerEvent_GetWindowX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PinchGesture_GetScale"
+ "name": "OH_ArkUI_PointerEvent_GetWindowY"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PinchGesture_GetCenterX"
+ "name": "OH_ArkUI_PointerEvent_GetDisplayX"
},
{
"first_introduced": "12",
- "name": "OH_ArkUI_PinchGesture_GetCenterY"
+ "name": "OH_ArkUI_PointerEvent_GetDisplayY"
},
{
"first_introduced": "12",
@@ -333,20 +325,28 @@
},
{
"first_introduced": "12",
- "name": "OH_NativeXComponent_SetNeedSoftKeyboard"
+ "name": "OH_ArkUI_AxisEvent_GetVerticalAxisValue"
},
{
"first_introduced": "12",
- "name": "OH_NativeXComponent_RegisterSurfaceShowCallback"
+ "name": "OH_ArkUI_AxisEvent_GetHorizontalAxisValue"
},
{
"first_introduced": "12",
- "name": "OH_NativeXComponent_RegisterSurfaceHideCallback"
+ "name": "OH_ArkUI_AxisEvent_GetPinchAxisScaleValue"
+ },
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_AxisEvent_GetAxisAction"
},
{
"first_introduced": "12",
"name": "OH_NativeXComponent_RegisterOnTouchInterceptCallback"
},
+ {
+ "first_introduced": "12",
+ "name": "OH_NativeXComponent_SetNeedSoftKeyboard"
+ },
{
"first_introduced": "12",
"name": "OH_ArkUI_QueryModuleInterface"
@@ -2759,10 +2759,30 @@
"first_introduced": "15",
"name": "OH_ArkUI_AccessibilityProviderRegisterCallbackWithInstance"
},
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_KeyEvent_Dispatch"
+ },
{
"first_introduced": "15",
"name": "OH_ArkUI_PointerEvent_GetChangedPointerId"
},
+ {
+ "first_introduced": "19",
+ "name": "OH_ArkUI_DragEvent_RequestDragEndPending"
+ },
+ {
+ "first_introduced": "19",
+ "name": "OH_ArkUI_NotifyDragResult"
+ },
+ {
+ "first_introduced": "19",
+ "name": "OH_ArkUI_NotifyDragEndPendingDone"
+ },
+ {
+ "first_introduced": "20",
+ "name": "OH_ArkUI_EnableDropDisallowedBadge"
+ },
{
"first_introduced": "18",
"name": "OH_ArkUI_GetGestureParam_FingerCount"
@@ -2799,10 +2819,6 @@
"first_introduced": "18",
"name": "OH_ArkUI_GetGestureParam_DirectMask"
},
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_KeyEvent_Dispatch"
- },
{
"first_introduced": "15",
"name": "OH_ArkUI_ProgressLinearStyleOption_Create"
@@ -2879,18 +2895,6 @@
"first_introduced": "15",
"name": "OH_ArkUI_UnregisterDrawCallbackOnNodeHandle"
},
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_DragEvent_StartDataLoading"
- },
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_CancelDataLoading"
- },
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_DisableDropDataPrefetchOnNode"
- },
{
"first_introduced": "15",
"name": "OH_ArkUI_FocusRequest"
@@ -2959,6 +2963,14 @@
"first_introduced": "19",
"name": "OH_ArkUI_KeyframeAnimateOption_GetExpectedFrameRate"
},
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_DragEvent_StartDataLoading"
+ },
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_CancelDataLoading"
+ },
{
"first_introduced": "17",
"name": "OH_ArkUI_VisibleAreaEventOptions_Create"
@@ -2983,6 +2995,22 @@
"first_introduced": "17",
"name": "OH_ArkUI_VisibleAreaEventOptions_GetExpectedUpdateInterval"
},
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_DisableDropDataPrefetchOnNode"
+ },
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_PointerEvent_DestroyClonedEvent"
+ },
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPosition"
+ },
+ {
+ "first_introduced": "15",
+ "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPositionByIndex"
+ },
{
"first_introduced": "17",
"name": "OH_ArkUI_UIInputEvent_GetEventTargetWidth"
@@ -3023,22 +3051,6 @@
"first_introduced": "17",
"name": "OH_ArkUI_AxisEvent_GetScrollStep"
},
- {
- "first_introduced": "19",
- "name": "OH_ArkUI_DragEvent_RequestDragEndPending"
- },
- {
- "first_introduced": "19",
- "name": "OH_ArkUI_NotifyDragResult"
- },
- {
- "first_introduced": "19",
- "name": "OH_ArkUI_NotifyDragEndPendingDone"
- },
- {
- "first_introduced": "20",
- "name": "OH_ArkUI_EnableDropDisallowedBadge"
- },
{
"first_introduced": "18",
"name": "OH_ArkUI_GestureInterrupter_GetUserData"
@@ -3051,18 +3063,6 @@
"first_introduced": "15",
"name": "OH_ArkUI_PointerEvent_CreateClonedEvent"
},
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_PointerEvent_DestroyClonedEvent"
- },
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPosition"
- },
- {
- "first_introduced": "15",
- "name": "OH_ArkUI_PointerEvent_SetClonedEventLocalPositionByIndex"
- },
{
"first_introduced": "15",
"name": "OH_ArkUI_PointerEvent_SetClonedEventActionType"
@@ -3317,23 +3317,23 @@
},
{
"first_introduced": "19",
- "name": "OH_ArkUI_KeyEvent_IsNumLockOn"
+ "name": "OH_ArkUI_PanGesture_SetDistanceMap"
},
{
"first_introduced": "19",
- "name": "OH_ArkUI_KeyEvent_IsCapsLockOn"
+ "name": "OH_ArkUI_PanGesture_GetDistanceByToolType"
},
{
"first_introduced": "19",
- "name": "OH_ArkUI_KeyEvent_IsScrollLockOn"
+ "name": "OH_ArkUI_KeyEvent_IsNumLockOn"
},
{
"first_introduced": "19",
- "name": "OH_ArkUI_PanGesture_SetDistanceMap"
+ "name": "OH_ArkUI_KeyEvent_IsCapsLockOn"
},
{
"first_introduced": "19",
- "name": "OH_ArkUI_PanGesture_GetDistanceByToolType"
+ "name": "OH_ArkUI_KeyEvent_IsScrollLockOn"
},
{
"first_introduced": "20",
diff --git a/arkui/ace_engine/native/native_node.h b/arkui/ace_engine/native/native_node.h
index a3daf6262e6090bedc4194c16ec8b7af185c4fa2..3c8f1c73174b4a30a56cf7b7177a3c12bfa1910d 100644
--- a/arkui/ace_engine/native/native_node.h
+++ b/arkui/ace_engine/native/native_node.h
@@ -6599,7 +6599,8 @@ typedef enum {
/**
* @brief Defines the gesture event type.
*
- * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is {@link ArkUI_UIInputEvent}.
+ * When the event callback occurs, the union type in the {@link ArkUI_NodeEvent} object is
+ * {@link ArkUI_UIInputEvent}.
*/
NODE_TOUCH_EVENT = 0,
diff --git a/arkui/ace_engine/native/native_type.h b/arkui/ace_engine/native/native_type.h
index 828ba5b7d30727b121c7536c4bc4bf9731f6fec9..d196c82cfa0501eb165c2e3d036d2bd77401275d 100644
--- a/arkui/ace_engine/native/native_type.h
+++ b/arkui/ace_engine/native/native_type.h
@@ -2268,6 +2268,11 @@ typedef enum {
* @since 14
*/
ARKUI_ERROR_CODE_INVALID_STYLED_STRING = 180101,
+ /**
+ * @error The gesture recognizer type is not supported.
+ * @since 18
+ */
+ ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED = 180102,
/**
* @error The uiContext is invalid.
* @since 18
@@ -2278,11 +2283,6 @@ typedef enum {
* @since 18
*/
ARKUI_ERROR_CODE_CALLBACK_INVALID = 190002,
- /**
- * @error The gesture recognizer type is not supported.
- * @since 18
- */
- ARKUI_ERROR_CODE_RECOGNIZER_TYPE_NOT_SUPPORTED = 180102,
/**
* @error operation is not allowed for current drag drop pharse.
* @since 19
@@ -2339,22 +2339,6 @@ typedef enum {
} ArkUI_AccessibilityCheckedState;
/**
- * @brief Define accessible action types.
- *
- * @since 12
- */
-typedef enum {
- /** click action. */
- ARKUI_ACCESSIBILITY_ACTION_CLICK = 1 << 0,
- /** long click action. */
- ARKUI_ACCESSIBILITY_ACTION_LONG_CLICK = 1 << 1,
- /** cut action. */
- ARKUI_ACCESSIBILITY_ACTION_CUT = 1 << 2,
- /** copy action. */
- ARKUI_ACCESSIBILITY_ACTION_COPY = 1 << 3,
- /** paste action. */
- ARKUI_ACCESSIBILITY_ACTION_PASTE = 1 << 4,
-} ArkUI_AccessibilityActionType;
/**
* @brief Enumerates the animation playback modes.
@@ -2380,7 +2364,7 @@ typedef enum {
* @brief Define the rolling source enumeration value.
*
* @since 12
- */
+*/
typedef enum {
/** Finger drag. */
ARKUI_SCROLL_SOURCE_DRAG = 0,
@@ -2400,6 +2384,24 @@ typedef enum {
ARKUI_SCROLL_SOURCE_ANIMATION,
} ArkUI_ScrollSource;
+/**
+ * @brief Define accessible action types.
+ *
+ * @since 12
+ */
+typedef enum {
+ /** click action. */
+ ARKUI_ACCESSIBILITY_ACTION_CLICK = 1 << 0,
+ /** long click action. */
+ ARKUI_ACCESSIBILITY_ACTION_LONG_CLICK = 1 << 1,
+ /** cut action. */
+ ARKUI_ACCESSIBILITY_ACTION_CUT = 1 << 2,
+ /** copy action. */
+ ARKUI_ACCESSIBILITY_ACTION_COPY = 1 << 3,
+ /** paste action. */
+ ARKUI_ACCESSIBILITY_ACTION_PASTE = 1 << 4,
+} ArkUI_AccessibilityActionType;
+
/**
* @brief Defines the translation options for component transition.
*
@@ -4964,35 +4966,6 @@ float OH_ArkUI_ProgressLinearStyleOption_GetStrokeWidth(ArkUI_ProgressLinearStyl
*/
float OH_ArkUI_ProgressLinearStyleOption_GetStrokeRadius(ArkUI_ProgressLinearStyleOption* option);
-/**
- * @brief Creates an option for taking snapshot, the returned value must be released through
- * {@link OH_ArkUI_DestroySnapshotOptions} when it's not used anymore.
- *
- * @return Returns the pointer to the created snapshot options object.If the object returns a null pointer,
- * it indicates a creation failure, and the reason for the failure may be that the address space is full.
- * @since 15
- */
-ArkUI_SnapshotOptions* OH_ArkUI_CreateSnapshotOptions();
-
-/**
- * @brief Dispose a snapshot option object.
- *
- * @param snapshotOptions Indicates the pointer to the snapshot option.
- * @since 15
- */
-void OH_ArkUI_DestroySnapshotOptions(ArkUI_SnapshotOptions* snapshotOptions);
-
-/**
- * @brief Config the snapshot option with scale.
- *
- * @param snapshotOptions Indicates the pointer to the snapshot option.
- * @param scale Indicates the scale property to take the snapshot.
- * @return Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful.
- * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs.
- * @since 15
- */
-int32_t OH_ArkUI_SnapshotOptions_SetScale(ArkUI_SnapshotOptions* snapshotOptions, float scale);
-
/**
* @brief Create a cross-language option instance.
*
@@ -5028,6 +5001,35 @@ void OH_ArkUI_CrossLanguageOption_SetAttributeSettingStatus(ArkUI_CrossLanguageO
*/
bool OH_ArkUI_CrossLanguageOption_GetAttributeSettingStatus(ArkUI_CrossLanguageOption* option);
+/**
+ * @brief Creates an option for taking snapshot, the returned value must be released through
+ * {@link OH_ArkUI_DestroySnapshotOptions} when it's not used anymore.
+ *
+ * @return Returns the pointer to the created snapshot options object.If the object returns a null pointer,
+ * it indicates a creation failure, and the reason for the failure may be that the address space is full.
+ * @since 15
+ */
+ArkUI_SnapshotOptions* OH_ArkUI_CreateSnapshotOptions();
+
+/**
+ * @brief Dispose a snapshot option object.
+ *
+ * @param snapshotOptions Indicates the pointer to the snapshot option.
+ * @since 15
+ */
+void OH_ArkUI_DestroySnapshotOptions(ArkUI_SnapshotOptions* snapshotOptions);
+
+/**
+ * @brief Config the snapshot option with scale.
+ *
+ * @param snapshotOptions Indicates the pointer to the snapshot option.
+ * @param scale Indicates the scale property to take the snapshot.
+ * @return Returns {@link ARKUI_ERROR_CODE_NO_ERROR} if the operation is successful.
+ * Returns {@link ARKUI_ERROR_CODE_PARAM_INVALID} if a parameter error occurs.
+ * @since 15
+ */
+int32_t OH_ArkUI_SnapshotOptions_SetScale(ArkUI_SnapshotOptions* snapshotOptions, float scale);
+
/**
* @brief Defines the parameters for visible area change events.
*