Merge branch 'tizen_5.5' into tizen

Change-Id: Ibd68c5d19321e715e86efa6a82e848fa1dd3b510

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/ise-default.spec
index 3c0aa63,60ee720..61d83c9
--- 1/packaging/ise-default.spec
--- 2/packaging/ise-default.spec
+++ b/packaging/ise-default.spec
@@@ -26,13 -26,9 +26,10 @@@ BuildRequires:  pkgconfig(key-manager
  BuildRequires:  pkgconfig(ode)
  BuildRequires:  pkgconfig(capi-system-system-settings)
  BuildRequires:  pkgconfig(glib-2.0)
 +BuildRequires:  pkgconfig(dbus-1)
  BuildRequires:  pkgconfig(gio-2.0)
- Requires:       ise-engine-tables
- Requires:       ise-engine-tables-zh
- Requires:       ise-engine-hangul
+ BuildRequires:  pkgconfig(pkgmgr-info)
  Requires:       ise-engine-glm
- Requires:       ise-engine-anthy
  Requires:       ise-engine-default
  
  # This is for old profile-based OBS project optimizations.

diff --cc src/include/ise.h
Simple merge

diff --cc src/ise.cpp
index 56d6df2,8ebe3e7..6543966
--- 1/src/ise.cpp
--- 2/src/ise.cpp
+++ b/src/ise.cpp
@@@ -618,10 -628,16 +628,18 @@@ on_input_mode_changed(const sclchar *ke
              LANGUAGE_INFO *info = _language_manager.get_language_info(cur_lang);
              if (info) {
                  if (info->accepts_caps_mode) {
-                     engine_loader_send_imengine_event(MVK_Shift_Enable, 0);
+                     if (info->load_in_ime)
+                         ime_send_imengine_event(MVK_Shift_Enable, 0);
+                     else
+                         engine_loader_send_imengine_event(MVK_Shift_Enable, 0);
++
                      set_caps_mode(g_keyboard_state.caps_mode);
                  } else {
-                     engine_loader_send_imengine_event(MVK_Shift_Disable, 0);
+                     if (info->load_in_ime)
+                         ime_send_imengine_event(MVK_Shift_Disable, 0);
+                     else
+                         engine_loader_send_imengine_event(MVK_Shift_Disable, 0);
++
                      g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
                  }
              }

diff --cc src/sdk/ise_lang_table.cpp
Simple merge

diff --cc src/sdk/sdk.cpp
index 88aee26,26fa074..ee3ecf0
--- 1/src/sdk/sdk.cpp
--- 2/src/sdk/sdk.cpp
+++ b/src/sdk/sdk.cpp
@@@ -412,7 -466,10 +466,11 @@@ sclboolean CSDKISE::on_language_selecte
                                  g_keyboard_state.caps_mode = TRUE;
                              } else {
                                  g_ui->set_shift_state(SCL_SHIFT_STATE_OFF);
-                                 engine_loader_send_imengine_event(MVK_Shift_Off, 0);
+                                 if (table[loop].load_in_ime)
+                                     ime_send_imengine_event(MVK_Shift_Off, 0);
+                                 else
+                                     engine_loader_send_imengine_event(MVK_Shift_Off, 0);
++
                                  g_keyboard_state.caps_mode = FALSE;
                              }
                          } else {
@@@ -553,7 -610,10 +611,11 @@@ sclboolean CSDKISE::flush_imengine(cons
                  */
                  bRet = true;
              } else {
-                 engine_loader_reset_imengine();
+                 if (table[lang_id].load_in_ime)
+                     ime_reset_imengine();
+                 else
+                     engine_loader_reset_imengine();
++
                  bRet = true;
              }
          }