Support on demand mode in wearable profile

Change-Id: I4563b41bbbdf886e64b7c7bcfdc6bfc64a965424

diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp
index 39e5a32..bb6681b 100644 (file)
--- a/ism/demos/isf_demo_efl.cpp
+++ b/ism/demos/isf_demo_efl.cpp
@@ -59,9 +59,7 @@ static struct _menu_item isf_demo_menu_its[] = {
     { "ISF Return Key Disable", ise_return_key_disable_bt },
     { "ISF Input hint", ise_input_hint_bt },
     { "ISF IM Data", ise_imdata_set_bt },
-#ifdef _WEARABLE
     { "ISF ondemand", ise_ondemand_bt },
-#endif
     { "ISF Focus Movement", isf_focus_movement_bt },
     { "ISF Event", isf_event_demo_bt },
     { "ISF IM Control", imcontrolapi_bt },

diff --git a/ism/demos/isf_ondemand_efl.cpp b/ism/demos/isf_ondemand_efl.cpp
index 28435da..15682ad 100644 (file)
--- a/ism/demos/isf_ondemand_efl.cpp
+++ b/ism/demos/isf_ondemand_efl.cpp
@@ -31,9 +31,7 @@ static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, c
     Evas_Object *ef = create_ef (parent, label, guide_text, &en);
     if (!ef || !en) return NULL;
 
-#ifdef _WEARABLE
     elm_entry_input_panel_show_on_demand_set (en, ondemand);
-#endif
 
     return ef;
 }

diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp
index 1f71c4f..ffbb594 100644 (file)
--- a/ism/extras/efl_immodule/isf_imf_context.cpp
+++ b/ism/extras/efl_immodule/isf_imf_context.cpp
@@ -1578,19 +1578,13 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx)
         context_scim->impl->shift_mode_enabled = 0;
     }
 
-#ifdef _WEARABLE
     LOGD ("ctx : %p. on demand : %d\n", ctx, ecore_imf_context_input_panel_show_on_demand_get (ctx));
-#endif
 
     if (ecore_imf_context_input_panel_enabled_get (ctx)) {
-#ifdef _WEARABLE
         if (!ecore_imf_context_input_panel_show_on_demand_get (ctx))
             ecore_imf_context_input_panel_show (ctx);
         else
             LOGD ("ctx : %p input panel on demand mode : TRUE\n", ctx);
-#else
-        ecore_imf_context_input_panel_show (ctx);
-#endif
     }
     else
         LOGD ("ctx : %p input panel enable : FALSE\n", ctx);
@@ -4460,7 +4454,6 @@ slot_get_selection (IMEngineInstanceBase *si,
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
-#ifdef _WEARABLE
     EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *> (si->get_frontend_data ());
 
     if (_focused_ic && _focused_ic == ic) {
@@ -4477,7 +4470,6 @@ slot_get_selection (IMEngineInstanceBase *si,
             return true;
         }
     }
-#endif
     return false;
 }
 
@@ -4488,7 +4480,6 @@ slot_set_selection (IMEngineInstanceBase *si,
 {
     SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "...\n";
 
-#ifdef _WEARABLE
     EcoreIMFContextISF *ic = static_cast<EcoreIMFContextISF *> (si->get_frontend_data ());
 
     if (_focused_ic && _focused_ic == ic) {
@@ -4499,7 +4490,6 @@ slot_set_selection (IMEngineInstanceBase *si,
         ecore_imf_context_event_callback_call (_focused_ic->ctx, ECORE_IMF_CALLBACK_SELECTION_SET, &ev);
         return true;
     }
-#endif
     return false;
 }