-#ifndef __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
-#define __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
+#define DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H
/*
- * Copyright (c) 2016 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.
#include <dali/devel-api/common/map-wrapper.h>
#include <dali/devel-api/adaptor-framework/accessibility-action-handler.h>
#include <dali/devel-api/adaptor-framework/accessibility-gesture-handler.h>
+#include <dali/devel-api/adaptor-framework/accessibility-gesture-event.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/events/pan-gesture-event.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
}
/**
- * @copydoc Dali::Toolkit::AccessibilityManager::ActionReadIndicatorInformationSignal
- */
- AccessibilityActionSignalType& ActionReadIndicatorInformationSignal()
- {
- return mActionReadIndicatorInformationSignal;
- }
-
- /**
* @copydoc Dali::Toolkit::AccessibilityManager::ActionReadPauseResumeSignal
*/
AccessibilityActionSignalType& ActionReadPauseResumeSignal()
* @param[in] panEvent The pan event to be handled.
* @return whether the gesture is handled successfully or not.
*/
- virtual bool HandlePanGesture(const Integration::PanGestureEvent& panEvent);
+ virtual bool HandlePanGesture(const AccessibilityGestureEvent& panEvent);
/**
* Change the accessibility status when Accessibility feature(screen-reader) turned on or off.
/**
* 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).
/**
* Perform the accessibility action to move the focus to the first item on the top
- * and read from the top item continously (by three fingers single tap).
+ * and read from the top item continuously (by three fingers single tap).
* @return whether the accessibility action is performed or not.
*/
virtual bool AccessibilityActionReadFromTop();
/**
* Perform the accessibility action to move the focus to and read from the next item
- * continously (by three fingers double tap).
+ * continuously (by three fingers double tap).
* @return whether the accessibility action is performed or not.
*/
virtual bool AccessibilityActionReadFromNext();
virtual bool AccessibilityActionZoom();
/**
- * 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();
-
- /**
* 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.
*/
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)
AccessibilityActionSignalType mActionReadFromTopSignal;
AccessibilityActionSignalType mActionReadFromNextSignal;
AccessibilityActionSignalType mActionZoomSignal;
- AccessibilityActionSignalType mActionReadIndicatorInformationSignal;
AccessibilityActionSignalType mActionReadPauseResumeSignal;
AccessibilityActionSignalType mActionStartStopSignal;
AccessibilityActionScrollSignalType mActionScrollSignal;
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
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
bool mIsWrapped:1; ///< Whether the focus movement is wrapped around or not
bool mIsFocusWithinGroup:1; ///< Whether the focus movement is limited to the current focus group or not
bool mTtsCreated:1; ///< Whether the TTS Player has been accessed
bool mIsFocusIndicatorEnabled:1; ///< Whether indicator should be shown / hidden. It could be enabled when TTS enabled or 'Tab' key operated.
bool mContinuousPlayMode:1; ///< Keeps track of whether or not we are in continuous play mode
+ bool mIsFocusSoundFilePathSet:1; ///< Whether the path of the focus sound file has been set
+ bool mIsFocusChainEndSoundFilePathSet:1; ///< Whether the path of the focus chain end sound file has been set
};
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
+#endif // DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H