Support STT in Email and URL layout 05/94805/2
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 1 Nov 2016 08:48:30 +0000 (17:48 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 1 Nov 2016 09:05:42 +0000 (18:05 +0900)
Change-Id: I1910ff63235a9c3ae64cb8d897739f36266f9f56
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
src/ise.cpp

index a135633..863873d 100644 (file)
@@ -627,8 +627,9 @@ void CCoreEventCallback::on_process_input_device_event(sclu32 &type, sclchar *da
                         break;
                     case ISE_LAYOUT_STYLE_HEX:
                         if (_context_layout == ISE_LAYOUT_STYLE_EMAIL ||
-                            _context_layout == ISE_LAYOUT_STYLE_URL ||
-                            _context_layout == ISE_LAYOUT_STYLE_PASSWORD)
+                            _context_layout == ISE_LAYOUT_STYLE_URL)
+                            new_layout = ISE_LAYOUT_STYLE_VOICE;
+                        else if (_context_layout == ISE_LAYOUT_STYLE_PASSWORD)
                             new_layout = _context_layout;
                         else
                             new_layout = ISE_LAYOUT_STYLE_EMOTICON;
@@ -657,9 +658,7 @@ void CCoreEventCallback::on_process_input_device_event(sclu32 &type, sclchar *da
                         if (_context_layout == ISE_LAYOUT_STYLE_PASSWORD &&
                             _context_layout_variation == ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY)
                             ;   // PASSWORD NUMBER ONLY, do nothing
-                        else if (_context_layout == ISE_LAYOUT_STYLE_EMAIL ||
-                            _context_layout == ISE_LAYOUT_STYLE_URL ||
-                            _context_layout == ISE_LAYOUT_STYLE_PASSWORD)
+                        else if (_context_layout == ISE_LAYOUT_STYLE_PASSWORD)
                             new_layout = ISE_LAYOUT_STYLE_HEX;
                         else
                             new_layout = ISE_LAYOUT_STYLE_VOICE;
@@ -679,7 +678,11 @@ void CCoreEventCallback::on_process_input_device_event(sclu32 &type, sclchar *da
                         new_layout = ISE_LAYOUT_STYLE_HEX;
                         break;
                     case ISE_LAYOUT_STYLE_VOICE:
-                        new_layout = ISE_LAYOUT_STYLE_EMOTICON;
+                        if (_context_layout == ISE_LAYOUT_STYLE_EMAIL ||
+                            _context_layout == ISE_LAYOUT_STYLE_URL)
+                            new_layout = ISE_LAYOUT_STYLE_HEX;
+                        else
+                            new_layout = ISE_LAYOUT_STYLE_EMOTICON;
                         break;
                     default:
                         ;
@@ -1437,6 +1440,8 @@ ise_show(int ic)
             break;
         case ISE_LAYOUT_STYLE_EMAIL:
         case ISE_LAYOUT_STYLE_URL:
+            dot_num = 4;
+            break;
         case ISE_LAYOUT_STYLE_PASSWORD:
             if (_context_layout == ISE_LAYOUT_STYLE_PASSWORD &&
                 _context_layout_variation == ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD_VARIATION_NUMBERONLY)
@@ -1469,7 +1474,11 @@ ise_show(int ic)
                 focus_dot = 3;
                 break;
             case ISE_LAYOUT_STYLE_VOICE:
-                focus_dot = 4;
+                if (_context_layout == ISE_LAYOUT_STYLE_EMAIL ||
+                    _context_layout == ISE_LAYOUT_STYLE_URL)
+                    focus_dot = 3;
+                else
+                    focus_dot = 4;
                 break;
             default:
                 break;