projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.4.20] Merge branch 'devel/master'
[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
23da644
..
d51d753
100644
(file)
--- a/
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
+++ b/
dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.h
@@
-1,8
+1,8
@@
-#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) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-23,8
+23,8
@@
#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/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/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>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
@@
-498,7
+498,7
@@
private:
* @param[in] panEvent The pan event to be handled.
* @return whether the gesture is handled successfully or not.
*/
* @param[in] panEvent The pan event to be handled.
* @return whether the gesture is handled successfully or not.
*/
- virtual bool HandlePanGesture(const
Integration::Pan
GestureEvent& panEvent);
+ virtual bool HandlePanGesture(const
Accessibility
GestureEvent& panEvent);
/**
* Change the accessibility status when Accessibility feature(screen-reader) turned on or off.
/**
* Change the accessibility status when Accessibility feature(screen-reader) turned on or off.
@@
-635,14
+635,14
@@
private:
/**
* Perform the accessibility action to move the focus to the first item on the top
/**
* 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 contin
u
ously (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
* @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).
+ * contin
u
ously (by three fingers double tap).
* @return whether the accessibility action is performed or not.
*/
virtual bool AccessibilityActionReadFromNext();
* @return whether the accessibility action is performed or not.
*/
virtual bool AccessibilityActionReadFromNext();
@@
-654,12
+654,6
@@
private:
virtual bool AccessibilityActionZoom();
/**
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.
*/
* 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.
*/
@@
-771,4
+765,4
@@
inline const Internal::AccessibilityManager& GetImpl(const Dali::Toolkit::Access
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H__
+#endif //
DALI_TOOLKIT_INTERNAL_ACCESSIBILITY_MANAGER_H