From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 26 Jun 2015 14:09:53 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/new_mesh
X-Git-Tag: dali_1.0.47~13^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Fdevel%2Fnew_mesh;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch 'devel/master' into devel/new_mesh

Conflicts:
	automated-tests/src/dali-toolkit/CMakeLists.txt

Change-Id: Id952401475048d0f19f9ab8757695175ec46056e
---

d9c164e4530e354cd14dc4a1a658070ba55e99b8
diff --cc automated-tests/src/dali-toolkit/CMakeLists.txt
index bdf225cedb,6f5cfa197c..aae9626e34
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@@ -17,12 -22,18 +17,13 @@@ SET(TC_SOURCE
     utc-Dali-GaussianBlurView.cpp
     utc-Dali-JsonParser.cpp
     utc-Dali-KeyInputFocusManager.cpp
 -   utc-Dali-OverlayEffect.cpp
 -   utc-Dali-PageTurnEffect.cpp
     utc-Dali-PageTurnView.cpp
+    utc-Dali-Script.cpp
     utc-Dali-ScrollBar.cpp
     utc-Dali-ScrollView.cpp
 +   utc-Dali-ShaderEffects.cpp
     utc-Dali-ShadowView.cpp
 -   utc-Dali-ShearEffect.cpp
     utc-Dali-Slider.cpp
 -   utc-Dali-SoftButtonEffect.cpp
 -   utc-Dali-SpotEffect.cpp
 -   utc-Dali-SquareDissolveEffect.cpp
     utc-Dali-TableView.cpp
     utc-Dali-TextField.cpp
     utc-Dali-TextLabel.cpp
@@@ -32,7 -44,9 +33,7 @@@
     utc-Dali-Control.cpp
     utc-Dali-ControlImpl.cpp
     utc-Dali-DefaultControls.cpp
-    utc-Dali-AccessibilityFocusManager.cpp
 -   utc-Dali-DissolveEffect.cpp
+    utc-Dali-AccessibilityManager.cpp
 -   utc-Dali-IrisEffect.cpp
     utc-Dali-ItemLayout.cpp
     utc-Dali-ItemView.cpp
     utc-Dali-KeyboardFocusManager.cpp
diff --cc dali-toolkit/internal/controls/popup/popup-impl.cpp
index fa9bc5a0b4,f7c4188f03..d4fcc43661
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@@ -35,9 -35,8 +35,9 @@@
  // INTERNAL INCLUDES
  #include <dali-toolkit/public-api/controls/buttons/button.h>
  #include <dali-toolkit/public-api/controls/control-impl.h>
 +#include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
  #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
- #include <dali-toolkit/public-api/focus-manager/accessibility-focus-manager.h>
+ #include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
  #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
  #include <dali-toolkit/internal/controls/buttons/button-impl.h>
  
diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
index ce6e9f059b,871077fb13..385fd626b1
--- a/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
@@@ -1156,13 -1139,12 +1156,17 @@@ void TextField::KeyboardStatusChanged(b
    {
      mController->KeyboardFocusLostEvent();
    }
+   else
+   {
+     mController->KeyboardFocusGainEvent();
+   }
  }
  
 +void TextField::OnStageConnection( unsigned int depth )
 +{
 +  mDepth = depth;
 +}
 +
  bool TextField::OnTouched( Actor actor, const TouchEvent& event )
  {
    return true;