Merge "Added Control::SetSubState handling" into devel/master

diff --combined automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
index 2c395b2,054aaad..d32b7ff
--- 1/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
--- 2/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-KeyboardFocusManager.cpp
@@@ -609,10 -609,6 +609,10 @@@ int UtcDaliKeyboardFocusManagerSignalFo
  
    Integration::KeyEvent returnEvent("Return", "", 0, 0, 0, Integration::KeyEvent::Up);
  
 +  // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
 +  // It makes mIsFocusIndicatorEnabled true
 +  application.ProcessEvent(returnEvent);
 +
    // Create the first button and add it to the stage
    PushButton firstPushButton = PushButton::New();
    firstPushButton.SetKeyboardFocusable(true);
@@@ -668,10 -664,6 +668,10 @@@ int UtcDaliKeyboardFocusManagerSignalFo
    Integration::KeyEvent tabEvent("Tab", "", 0, 0, 0, Integration::KeyEvent::Down);
    Integration::KeyEvent shiftTabEvent("Tab", "", 0, 1, 0, Integration::KeyEvent::Down);
  
 +  // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
 +  // It makes mIsFocusIndicatorEnabled true
 +  application.ProcessEvent(tabEvent);
 +
    // Send the tab event to change focus group in the forward direction
    application.ProcessEvent(tabEvent);
    DALI_TEST_CHECK(focusGroupChangedCallback.mSignalVerified);
@@@ -795,10 -787,6 +795,10 @@@ int UtcDaliKeyboardFocusManagerChangeFo
    Integration::KeyEvent pageUpEvent("Prior", "", 0, 0, 0, Integration::KeyEvent::Down);
    Integration::KeyEvent pageDownEvent("Next", "", 0, 0, 0, Integration::KeyEvent::Down);
  
 +  // Press Any key to notice physical keyboard event is comming to KeyboardFocusManager
 +  // It makes mIsFocusIndicatorEnabled true
 +  application.ProcessEvent(leftEvent);
 +
    // Create a 2x2 table view and try to move focus inside it
    TableView tableView = TableView::New( 2, 2 );
    Stage::GetCurrent().Add(tableView);
@@@ -964,7 -952,7 +964,7 @@@ int UtcDaliKeyboardFocusManagerMoveFocu
    DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == Actor());
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
    focusChangedCallback.Reset();
  
    // Move the focus towards right
@@@ -983,8 -971,8 +983,8 @@@
    DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
    focusChangedCallback.Reset();
  
    // Move the focus towards up
@@@ -1023,8 -1011,8 +1023,8 @@@
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
  
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
  
    focusChangedCallback.Reset();
  
@@@ -1034,8 -1022,8 +1034,8 @@@
    DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == second);
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
  
    focusChangedCallback.Reset();
  
@@@ -1046,10 -1034,10 +1046,10 @@@
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == second);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
  
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
  
    focusChangedCallback.Reset();
  
@@@ -1060,10 -1048,10 +1060,10 @@@
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == fourth);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == third);
  
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
  
    focusChangedCallback.Reset();
  
@@@ -1073,10 -1061,10 +1073,10 @@@
    DALI_TEST_CHECK(focusChangedCallback.mSignalVerified);
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == third);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == first);
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
    focusChangedCallback.Reset();
  
    // Move the focus towards left. The focus move will fail as no way to move it upwards
@@@ -1086,10 -1074,10 +1086,10 @@@
    DALI_TEST_CHECK(preFocusChangeCallback.mCurrentFocusedActor == first);
    DALI_TEST_CHECK(preFocusChangeCallback.mProposedActorToFocus == Actor());
    DALI_TEST_CHECK(preFocusChangeCallback.mDirection == Control::KeyboardFocus::LEFT);
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
  
    preFocusChangeCallback.Reset();
    DALI_TEST_CHECK(!focusChangedCallback.mSignalVerified);
@@@ -1105,19 -1093,19 +1105,19 @@@
    DALI_TEST_CHECK(focusChangedCallback.mOriginalFocusedActor == first);
    DALI_TEST_CHECK(focusChangedCallback.mCurrentFocusedActor == fourth);
  
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "FOCUSED", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::FOCUSED, TEST_LOCATION );
  
    focusChangedCallback.Reset();
  
    // Clear the focus
    manager.ClearFocus();
-   DALI_TEST_EQUALS(first.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(second.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(third.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
-   DALI_TEST_EQUALS(fourth.GetProperty<std::string>(DevelControl::Property::STATE), "NORMAL", TEST_LOCATION );
+   DALI_TEST_EQUALS(first.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(second.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(third.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
+   DALI_TEST_EQUALS(fourth.GetProperty<int>(DevelControl::Property::STATE), (int)DevelControl::NORMAL, TEST_LOCATION );
  
  
    END_TEST;