bool UiDevice::executeAndWaitForEvents
(const Runnable *cmd, const A11yEvent type, const int timeout, const std::string packageName, const int count) const
{
+ std::vector<std::shared_ptr<AccessibleNode>> wins;
+
//FIXME: Need to get top window
- auto wins = this->getWindowRoot();
+ if (type != A11yEvent::EVENT_NONE && (A11yEvent::EVENT_WINDOW_RENDER_POST & type) == type)
+ {
+ wins = this->getWindowRoot();
+ return AccessibleWatcher::getInstance()->executeAndWaitForEvents(cmd, type, timeout, packageName, wins[0], count);
+ }
- return AccessibleWatcher::getInstance()->executeAndWaitForEvents(cmd, type, timeout, packageName, wins[0], count);
+ return AccessibleWatcher::getInstance()->executeAndWaitForEvents(cmd, type, timeout, packageName, NULL, count);
}
bool UiDevice::sendKeyAndWaitForEvents(
return A11yEvent::EVENT_WINDOW_DEACTIVATE;
else if (type == ::aurum::ReqActionAndWaitEvent_EventType::ReqActionAndWaitEvent_EventType_EVENT_WINDOW_IDLE)
return A11yEvent::EVENT_WINDOW_RENDER_POST;
+ else if (type == ::aurum::ReqActionAndWaitEvent_EventType::ReqActionAndWaitEvent_EventType_EVENT_WINDOW_MINIMIZE)
+ return A11yEvent::EVENT_WINDOW_MINIMIZE;
+ else if (type == ::aurum::ReqActionAndWaitEvent_EventType::ReqActionAndWaitEvent_EventType_EVENT_WINDOW_RAISE)
+ return A11yEvent::EVENT_WINDOW_RAISE;
else
return A11yEvent::EVENT_STATE_CHANGED_FOCUSED;
}
enum EventType {
EVENT_WINDOW_ACTIVATE = 0;
EVENT_WINDOW_DEACTIVATE = 1;
- EVENT_STATE_CHANGED_FOCUSED = 2;
- EVENT_WINDOW_IDLE = 3;
+ EVENT_WINDOW_MINIMIZE = 2;
+ EVENT_WINDOW_RAISE = 3;
+ EVENT_WINDOW_IDLE = 4;
+ EVENT_STATE_CHANGED_FOCUSED = 5;
}
ActionType type = 1;
oneof params {
message RspSetXMLSync {
RspStatus status = 1;
-}
\ No newline at end of file
+}