Turn off prediction in password layout of on-demand launch mode

Change-Id: Icb74257f7afa3c579e11487066b046e64abafcc0
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
index 711836d..0b56ca8 100644 (file)
--- a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
+++ b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp
@@ -165,9 +165,9 @@ void isf_wsc_context_input_panel_show (WSCContextISF* wsc_ctx)
 
     iseContext.bidi_direction = wsc_context_bidi_direction_get (wsc_ctx);
 
-    LOGD ("ctx : %p, layout : %d, layout variation : %d, language : %d, cursor position : %d", wsc_ctx, iseContext.layout, iseContext.layout_variation, iseContext.language, iseContext.cursor_pos);
-    LOGD ("caps mode : %d, return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.caps_mode, iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
-    LOGD ("password mode : %d, prediction_allow : %d, input hint : %#x, bidi direction : %d", iseContext.password_mode, iseContext.prediction_allow, iseContext.input_hint, iseContext.bidi_direction);
+    LOGI ("ctx : %p, layout : %d, layout variation : %d, language : %d, cursor position : %d", wsc_ctx, iseContext.layout, iseContext.layout_variation, iseContext.language, iseContext.cursor_pos);
+    LOGI ("caps mode : %d, return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.caps_mode, iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type);
+    LOGI ("password mode : %d, prediction_allow : %d, input hint : %#x, bidi direction : %d", iseContext.password_mode, iseContext.prediction_allow, iseContext.input_hint, iseContext.bidi_direction);
 
     int mime_type_size = strlen (mime_types);
     if (mime_type_size > 0) {
@@ -304,4 +304,4 @@ void isf_wsc_context_input_hint_set (WSCContextISF *ctx, Ecore_IMF_Input_Hints i
 {
     SECURE_LOGD("input hint : %d\n", input_hint);
     _isf_wsc_context_input_hint_set (_get_context_id(ctx), input_hint);
-}
\ No newline at end of file
+}

diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
index a7f4d1e..823f872 100644 (file)
--- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
+++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp
@@ -3507,11 +3507,20 @@ public:
         WSCContextISF* ic = find_ic(context_id);
         if (!ic || !ic->im_ctx) return;
 
+        Ecore_IMF_Input_Panel_Layout input_panel_layout = wsc_context_input_panel_layout_get (ic);
+
         if (ic->layout_initialized)
-            isf_wsc_context_input_panel_layout_set (ic, wsc_context_input_panel_layout_get (ic));
+            isf_wsc_context_input_panel_layout_set (ic, input_panel_layout);
+
+        if (ic->prediction_allow_initialized) {
+            Eina_Bool prediction_allow = wsc_context_prediction_allow_get (ic);
+            if (input_panel_layout == ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD) {
+                LOGI ("set prediction allow : FALSE in password layout");
+                prediction_allow = EINA_FALSE;
+            }
 
-        if (ic->prediction_allow_initialized)
-            g_info_manager->set_prediction_allow (WAYLAND_MODULE_CLIENT_ID, wsc_context_prediction_allow_get (ic));
+            g_info_manager->set_prediction_allow (WAYLAND_MODULE_CLIENT_ID, prediction_allow);
+        }
 
         if (ic->autocapital_type_initialized)
             isf_wsc_context_autocapital_type_set (ic, wsc_context_autocapital_type_get (ic));