X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Faccessibility-manager%2Faccessibility-manager-impl.cpp;h=9eeab0e20d000231ebcfb4ed46453731f02f5fd7;hb=15867edb828e4414d4e8c465ad3b89290f76ff2c;hp=eb452c0a8889861ec95a670127abc8951cc0cda4;hpb=6c08cdaeec81f3ef4cee4e6b90b5ed545a27c0ba;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
index eb452c0..9eeab0e 100644
--- a/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
+++ b/dali-toolkit/internal/accessibility-manager/accessibility-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -108,7 +108,9 @@ bool IsActorFocusableFunction(Actor actor, Dali::HitTestAlgorithm::TraverseType
 
 AccessibilityManager::AccessibilityManager()
 : mCurrentFocusActor(FocusIDPair(0, 0)),
+  mCurrentGesturedActor(),
   mFocusIndicatorActor(),
+  mPreviousPosition( 0.0f, 0.0f ),
   mRecursiveFocusMoveCounter(0),
   mIsWrapped(false),
   mIsFocusWithinGroup(false),
@@ -1238,19 +1240,6 @@ bool AccessibilityManager::AccessibilityActionZoom()
   return ret;
 }
 
-bool AccessibilityManager::AccessibilityActionReadIndicatorInformation()
-{
-  Dali::Toolkit::AccessibilityManager handle( this );
-  if( !mActionReadIndicatorInformationSignal.Empty() )
-  {
-    mActionReadIndicatorInformationSignal.Emit( handle );
-  }
-
-  // TODO: Read the information in the indicator
-
-  return mIsAccessibilityTtsEnabled;
-}
-
 bool AccessibilityManager::AccessibilityActionReadPauseResume()
 {
   Dali::Toolkit::AccessibilityManager handle( this );
@@ -1309,11 +1298,11 @@ bool AccessibilityManager::AccessibilityActionTouch(const TouchEvent& touchEvent
   return handled;
 }
 
-bool AccessibilityManager::HandlePanGesture(const Integration::PanGestureEvent& panEvent)
+bool AccessibilityManager::HandlePanGesture(const AccessibilityGestureEvent& panEvent)
 {
   bool handled = false;
 
-  if( panEvent.state == Gesture::Started )
+  if( panEvent.state == AccessibilityGestureEvent::Started )
   {
     // Find the focusable actor at the event position
     Dali::HitTestAlgorithm::Results results;
@@ -1330,7 +1319,7 @@ bool AccessibilityManager::HandlePanGesture(const Integration::PanGestureEvent&
 
   // Gesture::Finished (Up) events are delivered with previous (Motion) event position
   // Use the real previous position; otherwise we may incorrectly get a ZERO velocity
-  if ( Gesture::Finished != panEvent.state )
+  if ( AccessibilityGestureEvent::Finished != panEvent.state )
   {
     // Store the previous position for next Gesture::Finished iteration.
     mPreviousPosition = panEvent.previousPosition;
@@ -1338,7 +1327,8 @@ bool AccessibilityManager::HandlePanGesture(const Integration::PanGestureEvent&
 
   Actor rootActor = Stage::GetCurrent().GetRootLayer();
 
-  Dali::PanGesture pan(panEvent.state);
+  Dali::PanGesture pan( static_cast<Dali::Gesture::State>(panEvent.state) );
+
   pan.time = panEvent.time;
   pan.numberOfTouches = panEvent.numberOfTouches;
   pan.screenPosition = panEvent.currentPosition;