-#ifndef __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
-#define __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#ifndef DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
+#define DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/math/vector2.h>
-#include <dali/public-api/events/touch-point.h>
+#include <dali/devel-api/events/touch-point.h>
#include <dali/integration-api/events/touch-event-combiner.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
-#include <dali/internal/window-system/common/indicator-interface.h>
#include <dali/internal/accessibility/common/accessibility-gesture-detector.h>
namespace Dali
void SetGestureHandler(AccessibilityGestureHandler& handler);
/**
- * @brief Set the Indicator
- * @param[in] Indiciator interface
- */
- void SetIndicator( IndicatorInterface* indicator );
-
- /**
* @copydoc Dali::AccessibilityAdaptor::HandleActionNextEvent()
*/
virtual bool HandleActionNextEvent( bool allowEndFeedback = true);
/**
* @copydoc Dali::AccessibilityAdaptor::HandleActionScrollEvent()
*/
- bool HandleActionScrollEvent(const TouchPoint& point, unsigned long timeStamp);
-
- /**
- * @copydoc Dali::AccessibilityAdaptor::HandleActionTouchEvent()
- */
- bool HandleActionTouchEvent(const TouchPoint& point, unsigned long timeStamp);
+ bool HandleActionScrollEvent(const TouchPoint& point, uint32_t timeStamp);
/**
* @copydoc Dali::AccessibilityAdaptor::HandleActionBackEvent()
bool HandleActionZoomEvent();
/**
- * @copydoc Dali::AccessibilityAdaptor::HandleActionReadIndicatorInformationEvent()
- */
- bool HandleActionReadIndicatorInformationEvent();
-
- /**
* @copydoc Dali::AccessibilityAdaptor::HandleActionReadPauseResumeEvent()
*/
bool HandleActionReadPauseResumeEvent();
AccessibilityGestureDetectorPtr mAccessibilityGestureDetector; ///< The accessibility gesture detector
- IndicatorInterface* mIndicator; ///< The indicator
-
bool mIsEnabled : 1; ///< enable/disable the accessibility action
- bool mIndicatorFocused : 1; ///< Whether the Indicator is focused
public:
} // namespace Dali
-#endif // __DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H__
+#endif // DALI_INTERNAL_ACCESSIBILITY_ADAPTOR_H