Merge branch 'devel/master' into sandbox/dkdk/tizen

[platform/core/uifw/dali-adaptor.git] / dali / devel-api / adaptor-framework / accessibility-action-handler.h

diff --git a/dali/devel-api/adaptor-framework/accessibility-action-handler.h b/dali/devel-api/adaptor-framework/accessibility-action-handler.h
index 85a3af2..9ceaf58 100644 (file)
--- a/dali/devel-api/adaptor-framework/accessibility-action-handler.h
+++ b/dali/devel-api/adaptor-framework/accessibility-action-handler.h
@@ -1,8 +1,8 @@
-#ifndef __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
-#define __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
+#ifndef DALI_ACCESSIBILITY_ACTION_HANDLER_H
+#define DALI_ACCESSIBILITY_ACTION_HANDLER_H
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,12 +19,11 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali/public-api/dali-adaptor-common.h>
 #include <dali/public-api/events/touch-event.h>
 
 namespace Dali
 {
-
 /**
  * AccessibilityActionHandler is an abstract interface, used by Dali to handle accessibility actions
  * passed by the accessibility manager.
@@ -32,7 +31,6 @@ namespace Dali
 class AccessibilityActionHandler
 {
 public:
-
   /**
    * Change the accessibility status when Accessibility feature(screen-reader) turned on or off.
    * @return whether the status is changed or not.
@@ -47,10 +45,10 @@ public:
 
   /**
    * Perform the accessibility action associated with a scroll event.
-   * @param touchEvent The touch point (and time) of the event.
+   * @param touch The touch point (and time) of the event.
    * @return whether the focus is cleared or not.
    */
-  virtual bool AccessibilityActionScroll( Dali::TouchEvent& touchEvent ) = 0;
+  virtual bool AccessibilityActionScroll(Dali::TouchEvent& touch) = 0;
 
   /**
    * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up).
@@ -187,12 +185,6 @@ public:
   virtual bool AccessibilityActionZoom() = 0;
 
   /**
-   * Perform the accessibility action to read the information in the indicator (by two fingers triple tap).
-   * @return whether the accessibility action is performed or not.
-   */
-  virtual bool AccessibilityActionReadIndicatorInformation() = 0;
-
-  /**
    * Perform the accessibility action to pause/resume the current read out (by two fingers single tap).
    * @return whether the accessibility action is performed or not.
    */
@@ -204,15 +196,8 @@ public:
    */
   virtual bool AccessibilityActionStartStop() = 0;
 
-  /**
-   * Perform the accessibility action to mouse move (by one finger tap & hold and move).
-   * @param touchEvent touch event structure
-   * @return whether the accessibility action is performed or not.
-   */
-  virtual bool AccessibilityActionTouch(const Dali::TouchEvent& touchEvent) = 0;
-
 }; // class AccessibilityActionHandler
 
 } // namespace Dali
 
-#endif // __DALI_ACCESSIBILITY_ACTION_HANDLER_H__
+#endif // DALI_ACCESSIBILITY_ACTION_HANDLER_H