add press home

Change-Id: I0bffe01b65f94064811f0427af041118c0bc809f

diff --git a/src/mmimgr/iu/VoiceTouchEngine.cpp b/src/mmimgr/iu/VoiceTouchEngine.cpp
index fb8f3c0..f7df9b2 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.cpp
+++ b/src/mmimgr/iu/VoiceTouchEngine.cpp
@@ -37,6 +37,7 @@ static const string __PRE_DEFINED_SHOW_GRID = "SHOW_GRID";
 static const string __PRE_DEFINED_REFRESH_WINDOW_INFO = "REFRESH_WINDOW_INFO";
 static const string __PRE_DEFINED_REQUEST_TURNING_OFF = "REQUEST_TURNING_OFF";
 static const string __PRE_DEFINED_OPERATION_PRESS_BACK = "OPERATION_PRESS_BACK";
+static const string __PRE_DEFINED_OPERATION_PRESS_HOME = "OPERATION_PRESS_HOME";
 static const string __PRE_DEFINED_OPERATION_PRESS_UP = "OPERATION_PRESS_UP";
 static const string __PRE_DEFINED_OPERATION_PRESS_DOWN = "OPERATION_PRESS_DOWN";
 static const string __PRE_DEFINED_OPERATION_PRESS_LEFT = "OPERATION_PRESS_LEFT";
@@ -49,6 +50,7 @@ static const string __PRE_DEFINED_OPERATION_PANEL_OFF = "OPERATION_PANEL_OFF";
 
 static const map<string, int> __OPERATION_REQUEST = {
        {__PRE_DEFINED_OPERATION_PRESS_BACK, MMI_VOICE_TOUCH_OPERATION_PRESS_BACK},
+       {__PRE_DEFINED_OPERATION_PRESS_HOME, MMI_VOICE_TOUCH_OPERATION_PRESS_HOME},
        {__PRE_DEFINED_OPERATION_PRESS_UP, MMI_VOICE_TOUCH_OPERATION_PRESS_UP},
        {__PRE_DEFINED_OPERATION_PRESS_DOWN, MMI_VOICE_TOUCH_OPERATION_PRESS_DOWN},
        {__PRE_DEFINED_OPERATION_PRESS_LEFT, MMI_VOICE_TOUCH_OPERATION_PRESS_LEFT},

diff --git a/src/mmimgr/mmi-common.h b/src/mmimgr/mmi-common.h
index 75505f5..a0c2b83 100644 (file)
--- a/src/mmimgr/mmi-common.h
+++ b/src/mmimgr/mmi-common.h
@@ -161,6 +161,7 @@ typedef enum mmi_voice_touch_mode
 typedef enum mmi_voice_touch_operation
 {
        MMI_VOICE_TOUCH_OPERATION_PRESS_BACK,
+       MMI_VOICE_TOUCH_OPERATION_PRESS_HOME,
        MMI_VOICE_TOUCH_OPERATION_PRESS_UP,
        MMI_VOICE_TOUCH_OPERATION_PRESS_DOWN,
        MMI_VOICE_TOUCH_OPERATION_PRESS_LEFT,

diff --git a/src/mmimgr/output_modality/TouchModule.cpp b/src/mmimgr/output_modality/TouchModule.cpp
index d041ff1..e78e8c7 100644 (file)
--- a/src/mmimgr/output_modality/TouchModule.cpp
+++ b/src/mmimgr/output_modality/TouchModule.cpp
@@ -84,6 +84,16 @@ bool TouchModule::PressBack()
        return ret;
 }
 
+bool TouchModule::PressHome()
+{
+       LOGD("execute press home");
+       std::shared_ptr<Aurum::UiDevice> device = Aurum::UiDevice::getInstance();
+       bool ret = false;
+       ret = device->pressHome(Aurum::KeyRequestType::STROKE);
+       LOGD("press home, ret = %d", ret);
+       return ret;
+}
+
 bool TouchModule::PressKey(std::string keyCode)
 {
        LOGD("execute keycode");

diff --git a/src/mmimgr/output_modality/TouchModule.h b/src/mmimgr/output_modality/TouchModule.h
index f7f5a2f..5be8638 100644 (file)
--- a/src/mmimgr/output_modality/TouchModule.h
+++ b/src/mmimgr/output_modality/TouchModule.h
@@ -31,6 +31,7 @@ public:
        bool ClickByObjectId(std::string key);
        bool ClickByCoordinate(int x, int y);
        bool PressBack();
+       bool PressHome();
        bool PressKey(std::string keyCode);
        bool Drag(int startX, int startY, int endX, int endY, int steps, int duration_ms);
 };

diff --git a/src/mmimgr/output_modality/mmi_output_modality.cpp b/src/mmimgr/output_modality/mmi_output_modality.cpp
index 3d847c4..141d6f2 100644 (file)
--- a/src/mmimgr/output_modality/mmi_output_modality.cpp
+++ b/src/mmimgr/output_modality/mmi_output_modality.cpp
@@ -99,6 +99,10 @@ static int __voice_touch_operation(mmi_output_modality_voice_touch modality)
                ret = g_touch_module->PressBack();
                break;
 
+       case MMI_VOICE_TOUCH_OPERATION_PRESS_HOME:
+               ret = g_touch_module->PressHome();
+               break;
+
        case MMI_VOICE_TOUCH_OPERATION_PRESS_UP:
                ret = g_touch_module->PressKey(std::string("Up"));
                break;

diff --git a/src/mmimgr/res/voice_touch_commands.json b/src/mmimgr/res/voice_touch_commands.json
index 9db13e3..bcb0665 100644 (file)
--- a/src/mmimgr/res/voice_touch_commands.json
+++ b/src/mmimgr/res/voice_touch_commands.json
@@ -51,6 +51,13 @@
                        ]
                },
                {
+                       "Result" : "OPERATION_PRESS_HOME",
+                       "Candidates" : [
+                               "홈으로",
+                               "홈 화면"
+                       ]
+               },
+               {
                        "Result" : "OPERATION_PRESS_UP",
                        "Candidates" : [
                                "위",
@@ -172,6 +179,13 @@
                        ]
                },
                {
+                       "Result" : "OPERATION_PRESS_HOME",
+                       "Candidates" : [
+                               "home",
+                               "go to home"
+                       ]
+               },
+               {
                        "Result" : "OPERATION_PRESS_UP",
                        "Candidates" : [
                                "up",