X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Finput%2Fubuntu-x11%2Fvirtual-keyboard-impl-x.cpp;h=2aa062dbfe5d5fe757907394f4403c46c2e17115;hb=6aa07bcd3edcdc6960b0ba9bc40e0982138dcc91;hp=864814d937242c95b955f1d7d693a34f534a0bb8;hpb=a546ae3b6f684611310ce12c0b9c6a4739d752e1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

diff --git a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
index 864814d..2aa062d 100755
--- a/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/virtual-keyboard-impl-x.cpp
@@ -19,16 +19,15 @@
 #include <dali/internal/input/common/virtual-keyboard-impl.h>
 
 // EXTERNAL INCLUDES
-#include <X11/Xlib.h>
-#include <dali/internal/system/linux/dali-ecore-x.h>
 #include <algorithm>
-
+#include <X11/Xlib.h>
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/integration-api/adaptor.h>
-#include <dali/internal/system/common/locale-utils.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
 #include <dali/internal/input/ubuntu-x11/input-method-context-impl-x.h>
+#include <dali/internal/system/common/locale-utils.h>
+#include <dali/internal/system/linux/dali-ecore-x.h>
 
 namespace Dali
 {
@@ -54,12 +53,9 @@ Ecore_IMF_Input_Panel_Return_Key_Type buttonActionMapping(Dali::InputMethod::But
     case InputMethod::ButtonAction::JOIN:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_JOIN;
     case InputMethod::ButtonAction::LOGIN:       return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_LOGIN;
     case InputMethod::ButtonAction::NEXT:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_NEXT;
-    case InputMethod::ButtonAction::PREVIOUS:    return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
     case InputMethod::ButtonAction::SEARCH:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH;
     case InputMethod::ButtonAction::SEND:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEND;
-    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::UNSPECIFIED: return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-    case InputMethod::ButtonAction::NONE:        return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
+    case InputMethod::ButtonAction::SIGNIN:      return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SIGNIN;
     default:                                     return ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
   }
 }