Moved Gesture::State and -::Type to gesture-enumerations.h.

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / accessibility-manager / accessibility-manager-impl.h

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
index 5c518fd..4eddb86 100644 (file)
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
 
 /*
- * Copyright (c) 2019 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.
@@ -27,7 +27,7 @@
 #include <dali/public-api/object/base-object.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
+#include <dali-toolkit/devel-api/accessibility-manager/accessibility-manager.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
 
 namespace Dali
@@ -407,14 +407,6 @@ public:  // Signals
   }
 
   /**
-   * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadIndicatorInformationSignal
-   */
-  AccessibilityActionSignalType& ActionReadIndicatorInformationSignal()
-  {
-    return mActionReadIndicatorInformationSignal;
-  }
-
-  /**
    * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadPauseResumeSignal
    */
   AccessibilityActionSignalType& ActionReadPauseResumeSignal()
@@ -514,10 +506,10 @@ private:
 
   /**
    * 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 );
+  virtual bool AccessibilityActionScroll( Dali::TouchEvent& touch );
 
   /**
    * Perform the accessibility action to move focus to the previous focusable actor (by one finger flick up).
@@ -666,13 +658,6 @@ private:
   virtual bool AccessibilityActionStartStop();
 
   /**
-   * 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 TouchEvent& touchEvent);
-
-  /**
    * This function is connected to the TtsPlayer StateChangeSignal.
    * It is called when the TTS players state changes.
    * @param previousState The previous state of the TTS player (for comparison)
@@ -717,7 +702,6 @@ private:
   AccessibilityActionSignalType       mActionReadFromTopSignal;
   AccessibilityActionSignalType       mActionReadFromNextSignal;
   AccessibilityActionSignalType       mActionZoomSignal;
-  AccessibilityActionSignalType       mActionReadIndicatorInformationSignal;
   AccessibilityActionSignalType       mActionReadPauseResumeSignal;
   AccessibilityActionSignalType       mActionStartStopSignal;
   AccessibilityActionScrollSignalType mActionScrollSignal;
@@ -727,7 +711,7 @@ private:
   FocusIDPair mCurrentFocusActor;           ///< The focus order and actor ID of current focused actor
   Actor mCurrentGesturedActor;              ///< The actor that will handle the gesture
   Actor mFocusIndicatorActor;               ///< The focus indicator actor shared by all the focusable actors for highlight
-  Vector2 mPreviousPosition;                ///< The previous pan position; useful for calculating velocity for Gesture::Finished events
+  Vector2 mPreviousPosition;                ///< The previous pan position; useful for calculating velocity for GestureState::FINISHED events
   unsigned int mRecursiveFocusMoveCounter;  ///< The counter to count the number of recursive focus movement attempted before the focus movement is successful.
   std::string mFocusSoundFilePath;          ///< The path of the focus sound file
   std::string mFocusChainEndSoundFilePath;  ///< The path of the focus chain end sound file