openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-02-17 09:31:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:openharmony/accessibility into release_0617_log

Browse Source
This commit is contained in:
Mupceet 2022-06-20 02:33:10 +00:00 committed by Gitee
commit 27698c4445
13 changed files with 24 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/aafwk/include/accessibility_ui_test_ability_impl.h
View File

@ -152,7 +152,7 @@ public:
AccessibilityElementInfo &child) override;
/**
* @brief Get the child node informations
* @brief Get the child node information
* @param parent The parent info to get child.
* @param children The element info of children.
* @return Return true if gets child elementInfo successfully, else return false.
@ -237,4 +237,4 @@ private:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_UI_TEST_ABILITY_IMPL_H
#endif // ACCESSIBILITY_UI_TEST_ABILITY_IMPL_H

4
frameworks/aafwk/include/accessible_ability_client_impl.h
View File

@ -184,7 +184,7 @@ public:
AccessibilityElementInfo &child) override;
/**
* @brief Get the child node informations
* @brief Get the child node information
* @param parent The parent info to get child.
* @param children The element info of children.
* @return Return true if gets child elementInfo successfully, else return false.
@ -298,4 +298,4 @@ private:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBLE_ABILITY_CLIENT_IMPL_H
#endif // ACCESSIBLE_ABILITY_CLIENT_IMPL_H

4
interfaces/innerkits/aafwk/include/accessibility_ui_test_ability.h
View File

@ -156,7 +156,7 @@ public:
AccessibilityElementInfo &child) = 0;
/**
* @brief Get the child node informations
* @brief Get the child node information
* @param parent The parent info to get child.
* @param children The element info of children.
* @return Return true if gets child elementInfo successfully, else return false.
@ -237,4 +237,4 @@ public:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_UI_TEST_ABILITY_H
#endif // ACCESSIBILITY_UI_TEST_ABILITY_H

4
interfaces/innerkits/aafwk/include/accessible_ability_client.h
View File

@ -147,7 +147,7 @@ public:
AccessibilityElementInfo &child) = 0;
/**
* @brief Get the child node informations
* @brief Get the child node information
* @param parent The parent info to get child.
* @param children The element info of children.
* @return Return true if gets child elementInfo successfully, else return false.
@ -235,4 +235,4 @@ public:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBLE_ABILITY_CLIENT_H
#endif // ACCESSIBLE_ABILITY_CLIENT_H

6
interfaces/innerkits/common/include/accessibility_event_info.h
View File

@ -282,9 +282,9 @@ protected:
/*
* The class define the event types and supply the api to
* get/set the property of event. and it triggerred by UI
* get/set the property of event. and it triggered by UI
* changed and sent to AA. According to the event property,
* AA can get event properties, such as: action triggerred
* AA can get event properties, such as: action triggered
* the event and the source.
*/
class AccessibilityEventInfo : public AccessibilityMemo {
@ -584,4 +584,4 @@ protected:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_EVENT_INFO_H
#endif // ACCESSIBILITY_EVENT_INFO_H

2
interfaces/kits/js/AccessibilityExtensionContext.d.ts vendored
View File

@ -294,4 +294,4 @@ interface GesturePos {
* @since 9
* @sysCap Accessibility
*/
type WindowType = 'application' | 'inputMethod' | 'system' | 'accessibilityOverlay' | 'screenDivider';
type WindowType = 'application' | 'inputMethod' | 'system' | 'accessibilityOverlay' | 'screenDivider';

1
interfaces/kits/napi/accessibility_extension_module_loader/BUILD.gn
View File

@ -42,6 +42,7 @@ ohos_shared_library("accessibility_extension_module") {
configs = [ ":accessibility_extension_module_config" ]
deps = [
"//foundation/ability/ability_runtime/frameworks/kits/appkit:app_context",
"//foundation/barrierfree/accessibility/interfaces/innerkits/aafwk:accessibleability",
"//foundation/barrierfree/accessibility/interfaces/innerkits/common:accessibility_common",
"//foundation/barrierfree/accessibility/interfaces/kits/napi:accessibility",

4
services/aams/include/accessibility_account_data.h
View File

@ -281,7 +281,7 @@ public:
void AddEventEnabled(EventType type);
/**
* @brief Delet enabled event which is needed by accessible ability.
* @brief Delete enabled event which is needed by accessible ability.
* @param type EventType
* @return null.
*/
@ -364,4 +364,4 @@ private:
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_ACCOUNT_DATA_H
#endif // ACCESSIBILITY_ACCOUNT_DATA_H

2
services/aams/include/accessibility_input_interceptor.h
View File

@ -35,7 +35,7 @@ class AccessibilityInputEventConsumer : public MMI::IInputEventConsumer {
public:
AccessibilityInputEventConsumer();
~AccessibilityInputEventConsumer();
void OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const override;
void OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const override {};
void OnInputEvent(std::shared_ptr<MMI::PointerEvent> pointerEvent) const override;
void OnInputEvent(std::shared_ptr<MMI::AxisEvent> axisEvent) const override {};
private:

4
services/aams/include/accessibility_keyevent_filter.h
View File

@ -106,7 +106,7 @@ private:
/**
* @brief Find processing event.
* @param connection the corresponding AccessiblityAbility
* @param sequenceNum the squence of event
* @param sequenceNum the sequence of event
* @return the processing event
*/
std::shared_ptr<ProcessingEvent> FindProcessingEvent(AccessibleAbilityConnection &connection,
@ -140,4 +140,4 @@ private:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_KEYEVENT_FILTER_H_
#endif // ACCESSIBILITY_KEYEVENT_FILTER_H_

19
services/aams/src/accessibility_input_interceptor.cpp
View File

@ -348,25 +348,6 @@ AccessibilityInputEventConsumer::~AccessibilityInputEventConsumer()
eventHandler_ = nullptr;
}
void AccessibilityInputEventConsumer::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const
{
HILOG_DEBUG();
auto interceptor = AccessibilityInputInterceptor::GetInstance();
if (!interceptor) {
HILOG_ERROR("interceptor is null.");
return;
}
if (!eventHandler_) {
HILOG_ERROR("eventHandler is empty.");
return;
}
auto task = std::bind(&AccessibilityInputInterceptor::ProcessKeyEvent, interceptor, keyEvent);
eventHandler_->PostTask(task, AppExecFwk::EventQueue::Priority::LOW);
}
void AccessibilityInputEventConsumer::OnInputEvent(std::shared_ptr<MMI::PointerEvent> pointerEvent) const
{
HILOG_DEBUG("PointerAction:%{public}d, SourceType:%{public}d, PointerId:%{public}d.",

5
services/aams/test/mock/src/mock_accessibility_input_interceptor.cpp
View File

@ -108,11 +108,6 @@ AccessibilityInputEventConsumer::AccessibilityInputEventConsumer()
AccessibilityInputEventConsumer::~AccessibilityInputEventConsumer()
{}
void AccessibilityInputEventConsumer::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) const
{
(void)keyEvent;
}
void AccessibilityInputEventConsumer::OnInputEvent(std::shared_ptr<MMI::PointerEvent> pointerEvent) const
{
(void)pointerEvent;

12
services/interface/include/parcel/accessibility_event_info_parcel.h
View File

@ -42,25 +42,25 @@ public:
AccessibilityEventInfoParcel(const AccessibilityEventInfo &eventInfo);
/**
* @brief Used for IPC comminication
* @brief Used for IPC communcation
* @param parcel
* @return true: Read parcel data successfully; ohterwise is not.
* @return true: Read parcel data successfully; otherwise is not.
* @since 3
* @sysCap Accessibility
*/
bool ReadFromParcel(Parcel &parcel);
/**
* @brief Used for IPC comminication
* @brief Used for IPC communcation
* @param parcel
* @return true: Write parcel data successfully; ohterwise is not.
* @return true: Write parcel data successfully; otherwise is not.
* @since 3
* @sysCap Accessibility
*/
virtual bool Marshalling(Parcel &parcel) const override;
/**
* @brief Used for IPC comminication
* @brief Used for IPC communcation
* @param parcel
* @return Read AccessibilityEventInfoParcel from parcel data
* @since 3
@ -70,4 +70,4 @@ public:
};
} // namespace Accessibility
} // namespace OHOS
#endif // ACCESSIBILITY_EVENT_INFO_PARCEL_H
#endif // ACCESSIBILITY_EVENT_INFO_PARCEL_H