add gridDepth in UiClickableObject class, and separate by uiObjectResultType for...

Change-Id: I4c966d568eb6517b1fe523211b45e7121b02c4ef

diff --git a/voice-touch/VoiceTouchEventManager.cs b/voice-touch/VoiceTouchEventManager.cs
index 80f984fdc75d8069ecf982ba92e19865793c2790..b93eb9c5073ef6c9dfc9e53c0338635796b02e52 100644 (file)
--- a/voice-touch/VoiceTouchEventManager.cs
+++ b/voice-touch/VoiceTouchEventManager.cs
@@ -31,6 +31,7 @@ namespace VoiceTouch
         public const string UI_CLICKED_OBJECT = "uiClickedObject";
         public const string ASR_PARTIAL_RESULT = "asrPartialResult";
         public const string ASR_FINAL_RESULT = "asrFinalResult";
+        public const string UI_OBJECT_RESULT_BY_GRID = "showGrids";
         public const string REJECT = "reject";
         public const string ERROR = "error";
 
@@ -50,8 +51,15 @@ namespace VoiceTouch
                 switch (type)
                 {
                     case UI_CLICKABLE_OBJECT:
-                        mVoiceTouchViewManager.ShowTooltip(voiceTouchResult.uiClickableObject.infoOfClickableObjects, voiceTouchResult.uiClickableObject.tooltipType);
-                        previousTooltipType = voiceTouchResult.uiClickableObject.tooltipType;
+                        if (voiceTouchResult.uiClickableObject.uiObjectResultType == UI_OBJECT_RESULT_BY_GRID)
+                        {
+                            mVoiceTouchViewManager.ShowGrid(voiceTouchResult.uiClickableObject.infoOfClickableObjects, voiceTouchResult.uiClickableObject.gridDepth);
+                        }
+                        else
+                        {
+                            mVoiceTouchViewManager.ShowTooltip(voiceTouchResult.uiClickableObject.infoOfClickableObjects, voiceTouchResult.uiClickableObject.tooltipType);
+                            previousTooltipType = voiceTouchResult.uiClickableObject.tooltipType;
+                        }
                         return;
                     case UI_CLICKED_OBJECT:
                         mVoiceTouchViewManager.HighlightTooltip(voiceTouchResult.uiClickedObject.infoOfClickedObjects, previousTooltipType);

diff --git a/voice-touch/VoiceTouchMmi/VoiceTouchResult.cs b/voice-touch/VoiceTouchMmi/VoiceTouchResult.cs
index 48b35ad8ec4c6b0a6400c21d1861af206edfb708..bc4d492fa4a24867af122cd291fd90002b5212e1 100644 (file)
--- a/voice-touch/VoiceTouchMmi/VoiceTouchResult.cs
+++ b/voice-touch/VoiceTouchMmi/VoiceTouchResult.cs
@@ -38,6 +38,7 @@ namespace VoiceTouch.VoiceTouchMmi
         public string uiObjectResultType;
         public string foregroundApp;
         public string tooltipType;
+        public int gridDepth;
         public int numOfClickableObjects;
         public List<ClickableObject> infoOfClickableObjects;
         public int timestamp;