add eventtype of voice for screen-analyzer, add key grab, add capability type

Change-Id: Iaee89ad3ef3fb0cd92061308c1ae5ecc6b9f37b8

diff --git a/src/mmimgr/iu/intent_understanding_engine.cpp b/src/mmimgr/iu/intent_understanding_engine.cpp
index adf5d337b4006540459602854c908c9c594cbdc4..4f738ea6fc25622636da1f64596352ab73336619 100644 (file)
--- a/src/mmimgr/iu/intent_understanding_engine.cpp
+++ b/src/mmimgr/iu/intent_understanding_engine.cpp
@@ -58,6 +58,24 @@ static unordered_map<int, string> voice_action_map
         { MMI_EVENT_VOICE_TYPE_EXIT,     "Exit" },
         { MMI_EVENT_VOICE_TYPE_STOP,     "Stop" },
         { MMI_EVENT_VOICE_TYPE_TERMINATE, "Terminate" },
+        { MMI_EVENT_VOICE_TYPE_SHOW_NUMBER, "ShowNumber" },
+        { MMI_EVENT_VOICE_TYPE_SHOW_LABEL, "ShowLabel" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_ONE, "TouchOne" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_TWO, "TouchTwo" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_THREE, "TouchThree" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_FOUR, "TouchFour" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_FIVE, "TouchFive" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_SIX, "TouchSix" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_SEVEN, "TouchSeven" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_EIGHT, "TouchEight" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_NINE, "TouchNine" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_TEN, "TouchTen" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_ELEVEN, "TouchEleven" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_TWELVE, "TouchTwelve" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_WIFI, "TouchWifi" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_DATETIME, "TouchDateTime" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_AUTOMODE, "TouchAutoMode" },
+        { MMI_EVENT_VOICE_TYPE_TOUCH_GRID, "TouchGrid" },
       };
 
 static unordered_map<int, string> gesture_action_map

diff --git a/src/mmimgr/mmi-common.h b/src/mmimgr/mmi-common.h
index 03c411932a825589a6ed8e1d6cf0af4eb38cbec7..a291883bb2858278458051fbf1604ed7b85b237e 100644 (file)
--- a/src/mmimgr/mmi-common.h
+++ b/src/mmimgr/mmi-common.h
@@ -74,7 +74,25 @@ typedef enum mmi_event_voice_type
        MMI_EVENT_VOICE_TYPE_BACK,
        MMI_EVENT_VOICE_TYPE_EXIT,
        MMI_EVENT_VOICE_TYPE_STOP,
-       MMI_EVENT_VOICE_TYPE_TERMINATE
+       MMI_EVENT_VOICE_TYPE_TERMINATE,
+       MMI_EVENT_VOICE_TYPE_SHOW_NUMBER,
+       MMI_EVENT_VOICE_TYPE_SHOW_LABEL,
+       MMI_EVENT_VOICE_TYPE_TOUCH_ONE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_TWO,
+       MMI_EVENT_VOICE_TYPE_TOUCH_THREE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_FOUR,
+       MMI_EVENT_VOICE_TYPE_TOUCH_FIVE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_SIX,
+       MMI_EVENT_VOICE_TYPE_TOUCH_SEVEN,
+       MMI_EVENT_VOICE_TYPE_TOUCH_EIGHT,
+       MMI_EVENT_VOICE_TYPE_TOUCH_NINE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_TEN,
+       MMI_EVENT_VOICE_TYPE_TOUCH_ELEVEN,
+       MMI_EVENT_VOICE_TYPE_TOUCH_TWELVE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_WIFI,
+       MMI_EVENT_VOICE_TYPE_TOUCH_DATETIME,
+       MMI_EVENT_VOICE_TYPE_TOUCH_AUTOMODE,
+       MMI_EVENT_VOICE_TYPE_TOUCH_GRID,
 } mmi_event_voice_type;
 
 typedef enum mmi_event_vision_type
@@ -261,6 +279,7 @@ typedef enum mmi_provider_capability
        MODALITY_PROVIDER_CAP_GESTURE_EVENT = (1 << 3),
        MODALITY_PROVIDER_CAP_VOICE_EVENT = (1 << 4),
        MODALITY_PROVIDER_CAP_VISION_EVENT = (1 << 5),
+       MODALITY_PROVIDER_CAP_SCREEN_ANALYZER_EVENT = (1 << 6),
        MODALITY_PROVIDER_CAP_UNKNOWN = ((ull)1 << 62),
        MODALITY_PROVIDER_CAP_MAX = ((ull)1 << 63)
 } mmi_provider_capability;

diff --git a/src/modules/modality_keyboard/mmi-keyboard-provider.h b/src/modules/modality_keyboard/mmi-keyboard-provider.h
index 93899ce2dafe0a88a9e17b81e3a5cbd7c1c1a628..a0a05afdccdbf9c581f3e9539f704d2eac3a6dda 100644 (file)
--- a/src/modules/modality_keyboard/mmi-keyboard-provider.h
+++ b/src/modules/modality_keyboard/mmi-keyboard-provider.h
@@ -28,9 +28,17 @@
 #include <mmi-provider-iface.h>
 #include <mmi-manager-dbg.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern mmi_provider_op_mode _provider_mode;
 
 bool keyboard_set_mode(mmi_provider_op_mode mode);
 mmi_provider_op_mode keyboard_get_mode(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif //__MMI_KEYBOARD_PROVIDER_H__

diff --git a/src/modules/modality_keyboard/wayland-input.c b/src/modules/modality_keyboard/wayland-input.c
index 401c647826f804d75e7209bae80aaea3af86f658..fbdc003ab0142ba06115b240213a2fa06e4f5d6a 100644 (file)
--- a/src/modules/modality_keyboard/wayland-input.c
+++ b/src/modules/modality_keyboard/wayland-input.c
@@ -531,10 +531,14 @@ void _do_keygrab(const char *keyname, uint32_t mode)
 }
 
 static keymap_info_t stored_keymap[] = {
-               { "XF86Back", TIZEN_KEYROUTER_MODE_EXCLUSIVE },
+               { "XF86Back", TIZEN_KEYROUTER_MODE_SHARED },
+               { "XF86Red", TIZEN_KEYROUTER_MODE_SHARED },
+               { "XF86Green", TIZEN_KEYROUTER_MODE_SHARED },
+               { "XF86Yellow", TIZEN_KEYROUTER_MODE_SHARED },
+               { "XF86Blue", TIZEN_KEYROUTER_MODE_SHARED },
                { "XF86Info", TIZEN_KEYROUTER_MODE_OVERRIDABLE_EXCLUSIVE},
                { "XF86BTVoice", TIZEN_KEYROUTER_MODE_SHARED},  // KEY_BT_VOICE
-               { "XF86KeyBtFarVoice", TIZEN_KEYROUTER_MODE_SHARED}  // KEY_BT_FAR_VOICE
+               { "XF86KeyBtFarVoice", TIZEN_KEYROUTER_MODE_EXCLUSIVE}  // KEY_BT_FAR_VOICE
 };
 
 void _keygrab_init(void)

diff --git a/src/modules/modality_keyboard/wayland-input.h b/src/modules/modality_keyboard/wayland-input.h
index 111ddbb33d0ca7eaf6c2eec47820d78f2ae5c1b6..9a024d64baf418bfe1ab40fe97f8886dbfe586e2 100644 (file)
--- a/src/modules/modality_keyboard/wayland-input.h
+++ b/src/modules/modality_keyboard/wayland-input.h
@@ -24,7 +24,15 @@
 #ifndef __WAYLAND_INPUT_H__
 #define __WAYLAND_INPUT_H__
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void wayland_input_init(void);
 void wayland_input_shutdown(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // __WAYLAND_INPUT_H__
\ No newline at end of file