Merge "Move tts-player.h from devel-api to public-api" into devel/master
authorKimmo Hoikka <kimmo.hoikka@samsung.com>
Thu, 11 Jun 2015 16:28:08 +0000 (09:28 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 11 Jun 2015 16:28:08 +0000 (09:28 -0700)
1  2 
dali-toolkit/internal/focus-manager/accessibility-focus-manager-impl.cpp

@@@ -23,7 -23,7 +23,7 @@@
  #include <dali/public-api/actors/layer.h>
  #include <dali/devel-api/adaptor-framework/accessibility-manager.h>
  #include <dali/devel-api/adaptor-framework/sound-player.h>
- #include <dali/devel-api/adaptor-framework/tts-player.h>
+ #include <dali/public-api/adaptor-framework/tts-player.h>
  #include <dali/public-api/animation/constraints.h>
  #include <dali/devel-api/events/hit-test-algorithm.h>
  #include <dali/public-api/images/resource-image.h>
@@@ -190,7 -190,7 +190,7 @@@ void AccessibilityFocusManager::SetFocu
      Property::Index propertyActorFocusable = actor.GetPropertyIndex(ACTOR_FOCUSABLE);
      if(propertyActorFocusable == Property::INVALID_INDEX)
      {
 -      propertyActorFocusable = actor.RegisterProperty(ACTOR_FOCUSABLE, true);
 +      propertyActorFocusable = actor.RegisterProperty( ACTOR_FOCUSABLE, true, Property::READ_WRITE );
      }
  
      if(order == 0)
@@@ -511,7 -511,7 +511,7 @@@ void AccessibilityFocusManager::SetFocu
      Property::Index propertyIsFocusGroup = actor.GetPropertyIndex(IS_FOCUS_GROUP);
      if(propertyIsFocusGroup == Property::INVALID_INDEX)
      {
 -      actor.RegisterProperty(IS_FOCUS_GROUP, isFocusGroup);
 +      actor.RegisterProperty( IS_FOCUS_GROUP, isFocusGroup, Property::READ_WRITE );
      }
      else
      {
@@@ -654,7 -654,7 +654,7 @@@ void AccessibilityFocusManager::SetFocu
      Property::Index propertyActorFocusable = actor.GetPropertyIndex(ACTOR_FOCUSABLE);
      if(propertyActorFocusable == Property::INVALID_INDEX)
      {
 -      actor.RegisterProperty(ACTOR_FOCUSABLE, focusable);
 +      actor.RegisterProperty( ACTOR_FOCUSABLE, focusable, Property::READ_WRITE );
      }
      else
      {