Remove foreground app from output result

- Issue:
MMI IU does not know forground app information.

- Solution:
Actually foreground app information is not used anywhere. Current voice
touch app UX does not need foreground app information. And also, screen
analyzer modality does not send foreground app information to mmi
manager. Thus, this patch removes unused information from output result.
Through this patch, IU does not need to manage app information.

Change-Id: I7fee0723b2ad3ce472199f869a4cc4d8aced34e8
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>

diff --git a/src/mmimgr/iu/VoiceTouchEngine.cpp b/src/mmimgr/iu/VoiceTouchEngine.cpp
index ad6d5b6a2777fbf619462370d78546aa13c69752..615348bd2d06c013761addd2342293d26ce16daf 100644 (file)
--- a/src/mmimgr/iu/VoiceTouchEngine.cpp
+++ b/src/mmimgr/iu/VoiceTouchEngine.cpp
@@ -409,7 +409,7 @@ void VoiceTouchEngine::makeClickableItemInfo(int timestamp, JsonProvider &provid
        }
 
        provider.setOutputEvent(MMI_KEY_UI_CLICKABLE_OBJECT);
-       provider.setUiClickableObject(resultType, __appId.c_str(), tooltipType, __itemList.size(), timestamp);
+       provider.setUiClickableObject(resultType, tooltipType, __itemList.size(), timestamp);
        provider.setGridDepth(__currentGridInfo.currentStep + 1);
 
        for (auto &item : *itemList) {
@@ -475,7 +475,6 @@ void VoiceTouchEngine::setSelectedItemResult(const ClickableItem &item, int time
 
        provider.setOutputEvent(MMI_KEY_UI_CLICKED_OBJECT);
        UiClickedObject object;
-       object.fgApp = __appId.c_str();
        object.timeStamp = timestamp;
        object.idx = item.index;
        object.x = item.coordX;

diff --git a/src/mmimgr/iu/json_provider.cpp b/src/mmimgr/iu/json_provider.cpp
index ce314065ea20ef675e4b7b79f52e63905a556456..5b5e8c3e2ac7273ed1a6ee50f27be8a9f6599279 100644 (file)
--- a/src/mmimgr/iu/json_provider.cpp
+++ b/src/mmimgr/iu/json_provider.cpp
@@ -86,14 +86,13 @@ void JsonProvider::setAsrFinalResult(const char* result, int timeStamp)
        json_object_set_int_member(mAsrFinalObj, MMI_KEY_TIMESTAMP, timeStamp);
 }
 
-void JsonProvider::setUiClickableObject(const char* resultType, const char* fgApp, const char* tooltipType, int numClickableObj, int timeStamp)
+void JsonProvider::setUiClickableObject(const char* resultType, const char* tooltipType, int numClickableObj, int timeStamp)
 {
     if (!mUiClickableObj)
         mUiClickableObj = json_object_new();
 
        json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKABLE_OBJECT, mUiClickableObj);
        json_object_set_string_member(mUiClickableObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, resultType);
-       json_object_set_string_member(mUiClickableObj, MMI_KEY_FOREGROUND_APP, fgApp);
        json_object_set_string_member(mUiClickableObj, MMI_KEY_TOOLTIP_TYPE, tooltipType);
        json_object_set_int_member(mUiClickableObj, MMI_KEY_NUM_OF_CLICKABLE_OBJECTS, numClickableObj);
        json_object_set_int_member(mUiClickableObj, MMI_KEY_TIMESTAMP, timeStamp);
@@ -133,7 +132,6 @@ void JsonProvider::setUiClickedObject(UiClickedObject &object)
         mUiClickedObj = json_object_new();
 
     json_object_set_object_member(mRootObj, MMI_KEY_UI_CLICKED_OBJECT, mUiClickedObj);
-    json_object_set_string_member(mUiClickedObj, MMI_KEY_FOREGROUND_APP, object.fgApp);
     json_object_set_int_member(mUiClickedObj, MMI_KEY_TIMESTAMP, object.timeStamp);
     json_object_set_string_member(mUiClickedObj, MMI_KEY_UI_OBJECT_RESULT_TYPE, object.resultType);
     json_object_set_int_member(mUiClickedObj, MMI_KEY_GRID_DEPTH, object.gridDepth);

diff --git a/src/mmimgr/iu/json_provider.h b/src/mmimgr/iu/json_provider.h
index 90bc1e4335c13e45f4aa6f6e3e7d4c92473c3631..550c6ebf6e6bd243971ecf27c0fdb9ff8bd600b7 100644 (file)
--- a/src/mmimgr/iu/json_provider.h
+++ b/src/mmimgr/iu/json_provider.h
@@ -25,7 +25,6 @@ using namespace std;
 #define MMI_KEY_SHOW_TOOLTIPS                  "showTooltips"         // TODO: make as enum type
 #define MMI_KEY_SHOW_GRIDS                             "showGrids"            // TODO: make as enum type
 #define MMI_KEY_CLICK_OBJECT                   "clickObject"          // TODO: make as enum type
-#define MMI_KEY_FOREGROUND_APP                 "foregroundApp"
 #define MMI_KEY_TOOLTIP_TYPE                   "tooltipType"
 #define MMI_KEY_TOOLTIP_TYPE_NUMBER            "tooltipNumber"
 #define MMI_KEY_TOOLTIP_TYPE_TEXT              "tooltipText"
@@ -45,7 +44,6 @@ using namespace std;
 #define MMI_REASON_NO_CLICKABLE_OBJECTS                "noClickableObjects"
 
 struct UiClickedObject{
-    const char* fgApp;
     int timeStamp;
     int idx;
     int x;
@@ -69,7 +67,7 @@ public:
     void setAsrPartialResult(const char* result, int timeStamp);    // "asr-partial-result", object
     void setAsrFinalResult(const char* result, int timeStamp);      // "asr-final-result", object
 
-    void setUiClickableObject(const char* resultType, const char* fgApp, const char* tooltipType, int numClickableObj, int timeStamp);   // "ui-clickable-object", object
+    void setUiClickableObject(const char* resultType, const char* tooltipType, int numClickableObj, int timeStamp);   // "ui-clickable-object", object
     void setGridDepth(int gridDepth);
     void addInfoClickableObject(int idx, int x, int y, int w, int h, const char* text);