From: Daekwang Ryu <dkdk.ryu@samsung.com>
Date: Tue, 24 Apr 2018 06:41:49 +0000 (+0900)
Subject: [Tizen] InputMethod enumeration moved to public API
X-Git-Tag: accepted/tizen/unified/20180426.062511^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F176983%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

[Tizen] InputMethod enumeration moved to public API

This reverts commit 0cfaf2c5ebb5ef9e0c7a392ed3b83b126dcdf49d.

Change-Id: I8bebfdd7bfffc52d7a08ede3ff7f39b39b926a81
---

diff --git a/dali/internal/input/tizen-wayland/ecore-wl2/imf-manager-impl-ecore-wl2.cpp b/dali/internal/input/tizen-wayland/ecore-wl2/imf-manager-impl-ecore-wl2.cpp
index 6348e1a..b21d9ed 100644
--- a/dali/internal/input/tizen-wayland/ecore-wl2/imf-manager-impl-ecore-wl2.cpp
+++ b/dali/internal/input/tizen-wayland/ecore-wl2/imf-manager-impl-ecore-wl2.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,12 +29,12 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/devel-api/adaptor-framework/input-method-devel.h>
 #include <dali/integration-api/adaptor.h>
 #include <dali/internal/system/common/locale-utils.h>
 #include <dali/internal/window-system/tizen-wayland/ecore-wl2/window-render-surface-ecore-wl2.h>
 #include <dali/internal/adaptor/common/adaptor-impl.h>
 #include <dali/internal/system/common/singleton-service-impl.h>
+#include <dali/public-api/adaptor-framework/input-method.h>
 
 #define TOKEN_STRING(x) #x
 
@@ -748,13 +748,13 @@ void ImfManagerEcoreWl::ApplyOptions( const InputMethodOptions& options )
   {
     ecore_imf_context_input_panel_layout_set( mIMFContext, panelLayoutMap[index] );
   }
-  if ( mOptions.CompareAndSet(AUTO_CAPITALISE, options, index) )
+  if ( mOptions.CompareAndSet(BUTTON_ACTION, options, index) )
   {
-    ecore_imf_context_autocapital_type_set( mIMFContext, autoCapitalMap[index] );
+    ecore_imf_context_input_panel_return_key_type_set( mIMFContext, returnKeyTypeMap[index] );
   }
-  if ( mOptions.CompareAndSet(ACTION_BUTTON_TITLE, options, index) )
+  if ( mOptions.CompareAndSet(AUTO_CAPITALIZE, options, index) )
   {
-    ecore_imf_context_input_panel_return_key_type_set( mIMFContext, returnKeyTypeMap[index] );
+    ecore_imf_context_autocapital_type_set( mIMFContext, autoCapitalMap[index] );
   }
   if ( mOptions.CompareAndSet(VARIATION, options, index) )
   {