Peter M. Groen / dali-demo

Commit dd6838fea147a53039510c5688ec19db7e9ec734

Authored by Adeel Kazmi
Committed by Gerrit Code Review
2 parents 8a5c094d 0f212263

Merge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master

Inline Side-by-side
Showing 1 changed file with 11 additions and 11 deletions
demo/dali-table-view.cpp
  View file @dd6838f
... ... @@ -387,12 +387,12 @@ void DaliTableView::Populate()
387 387 const Example& example = ( *iter );
388 388  
389 389 Actor tile = CreateTile( example.name, example.title, Vector3( tileParentMultiplier, tileParentMultiplier, 1.0f ), true );
390   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
391   - accessibilityFocusManager.SetFocusOrder( tile, ++exampleCount );
392   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_LABEL,
  390 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
  391 + accessibilityManager.SetFocusOrder( tile, ++exampleCount );
  392 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL,
393 393 example.title );
394   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_TRAIT, "Tile" );
395   - accessibilityFocusManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityFocusManager::ACCESSIBILITY_HINT,
  394 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_TRAIT, "Tile" );
  395 + accessibilityManager.SetAccessibilityAttribute( tile, Dali::Toolkit::AccessibilityManager::ACCESSIBILITY_HINT,
396 396 "You can run this example" );
397 397  
398 398 tile.SetPadding( Padding( margin, margin, margin, margin ) );
... ... @@ -551,7 +551,7 @@ bool DaliTableView::OnTilePressed( Actor actor, const TouchEvent& event )
551 551 std::string name = actor.GetName();
552 552 ExampleMapConstIter iter = mExampleMap.find( name );
553 553  
554   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
  554 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
555 555  
556 556 if( iter != mExampleMap.end() )
557 557 {
... ... @@ -594,11 +594,11 @@ void DaliTableView::OnPressedAnimationFinished( Dali::Animation& source )
594 594 if( name == BUTTON_QUIT )
595 595 {
596 596 // Move focus to the OK button
597   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
  597 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
598 598  
599 599 // Enable the group mode and wrap mode
600   - accessibilityFocusManager.SetGroupMode( true );
601   - accessibilityFocusManager.SetWrapMode( true );
  600 + accessibilityManager.SetGroupMode( true );
  601 + accessibilityManager.SetWrapMode( true );
602 602 }
603 603 }
604 604 else
... ... @@ -630,8 +630,8 @@ void DaliTableView::OnScrollComplete( const Dali::Vector2& position )
630 630 mScrolling = false;
631 631  
632 632 // move focus to 1st item of new page
633   - AccessibilityFocusManager accessibilityFocusManager = AccessibilityFocusManager::Get();
634   - accessibilityFocusManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
  633 + AccessibilityManager accessibilityManager = AccessibilityManager::Get();
  634 + accessibilityManager.SetCurrentFocusActor(mPages[mScrollView.GetCurrentPage()].GetChildAt(0) );
635 635 }
636 636  
637 637 bool DaliTableView::OnScrollTouched( Actor actor, const TouchEvent& event )
... ...