Fix candidate position issue for TV

Signed-off-by: liuxd <xd123.liu@samsung.com>
Change-Id: Id2a4f749ecb6228ba7946401e93277a51cc9f28c

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
index 1a68b6a..89e200a 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_ENGLISH.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="502" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="1920" height="440" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
     <button_normal>img_area_keypad.9.png</button_normal>
   </image_path>
@@ -8,7 +8,7 @@
     <rec button="pressed">btn_keypad_pressed.9.png</rec>
     <rec button="disabled">btn_keypad_normal.9.png</rec>
   </background_image>
-  <row y="62">
+  <row>
     <key key_type="control" width="240" label_type="IMAGE_DEFAULT">
       <image_label>
         <rec button="normal">ic_keypad_shift_bl.png</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
index 88d076a..e50d3dc 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_KOREAN.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="502" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="1920" height="440" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
     <button_normal>img_area_keypad.9.png</button_normal>
   </image_path>
@@ -8,7 +8,7 @@
     <rec button="pressed">btn_keypad_pressed.9.png</rec>
     <rec button="disabled">btn_keypad_normal.9.png</rec>
   </background_image>
-  <row y="62">
+  <row>
     <key key_type="control" width="240" label_type="IMAGE_DEFAULT">
       <image_label>
         <rec button="normal">ic_keypad_shift_bl.png</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
index 4fcd64d..7fd9887 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_NUMONLY.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="150" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="1920" height="88" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
     <button_normal>bg_keypad_dimmed_60.9.png</button_normal>
   </image_path>
@@ -8,7 +8,7 @@
     <rec button="pressed">btn_keypad_pressed.9.png</rec>
     <rec button="disabled">btn_keypad_normal.9.png</rec>
   </background_image>
-  <row x="180" y="62">
+  <row x="180">
     <key>
       <label>
         <rec>1</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
index 8d3e257..763e2f0 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="502" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="1920" height="440" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
     <button_normal>img_area_keypad.9.png</button_normal>
   </image_path>
@@ -8,7 +8,7 @@
     <rec button="pressed">btn_keypad_pressed.9.png</rec>
     <rec button="disabled">btn_keypad_normal.9.png</rec>
   </background_image>
-  <row y="62">
+  <row>
     <key key_type="modechange" width="240" label_type="FONT_OPTION">
       <label>
         <rec>≪1/2≫</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
index 0300b9f..5ea6994 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_QTY_SYM_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="502" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="1920" height="440" magnifier="false" key_width="120" key_height="88" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0" label_type="FONT_TEXT" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
     <button_normal>img_area_keypad.9.png</button_normal>
   </image_path>
@@ -8,7 +8,7 @@
     <rec button="pressed">btn_keypad_pressed.9.png</rec>
     <rec button="disabled">btn_keypad_normal.9.png</rec>
   </background_image>
-  <row y="62">
+  <row>
     <key key_type="modechange" width="240" label_type="FONT_OPTION">
       <label>
         <rec>≪2/2≫</rec>

diff --git a/data/layout/tv/LYT_LANDSCAPE_STT.xml b/data/layout/tv/LYT_LANDSCAPE_STT.xml
index f426792..eb254b5 100644 (file)
--- a/data/layout/tv/LYT_LANDSCAPE_STT.xml
+++ b/data/layout/tv/LYT_LANDSCAPE_STT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="1920" height="502" key_width="180" key_height="120" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_STT" sw_background="true" magnifier="false" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0">
+<layout width="1920" height="440" key_width="180" key_height="120" vibe_style="DEFAULT" sound_style="DEFAULT" label_type="3X4_STT" sw_background="true" magnifier="false" key_spacing="0" row_spacing="0" hit_left="0" hit_right="0" hit_top="0" hit_bottom="0">
   <background_color>
     <r>210</r>
     <g>213</g>

diff --git a/data/layout/tv/ise_lang_table.xml b/data/layout/tv/ise_lang_table.xml
index 1a6d01b..f984824 100644 (file)
--- a/data/layout/tv/ise_lang_table.xml
+++ b/data/layout/tv/ise_lang_table.xml
@@ -7,9 +7,13 @@
     <rec name="uuid_anthy" uuid="org.tizen.ise-engine-anthy"/>
     <rec name="uuid_zhuyin_big" uuid="org.tizen.ise-engine-tables.zhuyin-big"/>
     <rec name="uuid_cangjie_3" uuid="org.tizen.ise-engine-tables.cangjie3"/>
+    <rec name="uuid_clm_chinese" uuid="org.tizen.ise-engine-glm.chinese-pinyin"/>
+    <rec name="uuid_clm_stroke" uuid="org.tizen.ise-engine-glm.chinese-stoke"/>
+    <rec name="uuid_clm_english" uuid="org.tizen.ise-engine-glm.english"/>
+    <rec name="uuid_clm_korean" uuid="org.tizen.ise-engine-glm.korean"/>
 </keyboard_uuid_table>
 <language_table>
-  <rec language="English" language_name="English" inputmode_QTY="ENGLISH_QTY" inputmode_QTY_name="Qwerty" keyboard_ise_uuid="uuid_default" country_code_URL="uk" is_latin_language="true" accepts_caps_mode="true" locale_string="en_US"/>
+  <rec language="English" language_name="English" inputmode_QTY="ENGLISH_QTY" inputmode_QTY_name="Qwerty" keyboard_ise_uuid="uuid_clm_english" country_code_URL="uk" is_latin_language="true" accepts_caps_mode="true" locale_string="en_US"/>
   <rec language="Italian" language_name="Italiano" inputmode_QTY="ITALIAN_QTY" inputmode_QTY_name="Tastiera Qwerty" keyboard_ise_uuid="uuid_default" country_code_URL="it" is_latin_language="true" accepts_caps_mode="true" locale_string="it_IT"/>
   <rec language="Spanish" language_name="Español" inputmode_QTY="SPANISH_QTY" inputmode_QTY_name="Teclado Qwerty" keyboard_ise_uuid="uuid_default" country_code_URL="es" is_latin_language="true" accepts_caps_mode="true" locale_string="es_ES"/>
   <rec language="Galician" language_name="Galego" inputmode_QTY="GALICIAN_QTY" inputmode_QTY_name="Qwerty" keyboard_ise_uuid="uuid_default" country_code_URL="gl" is_latin_language="true" accepts_caps_mode="true" locale_string="gl_ES"/>
@@ -53,7 +57,7 @@
   <rec language="Hebrew" language_name="עברית" inputmode_QTY="HEBREW_QTY" inputmode_QTY_name="Hebrew" keyboard_ise_uuid="uuid_default" country_code_URL="il"/>
   -->
   <rec language="Korean" language_name="한글" inputmode_QTY="KOREAN_QTY" inputmode_QTY_name="쿼티" keyboard_ise_uuid="uuid_korean" country_code_URL="kr" locale_string="ko_KR"/>
-  <rec language="Chinese" language_name="简体中文" inputmode_QTY="CHINESE_QTY" inputmode_QTY_name="Qwerty键盘" main_keyboard_name="中" keyboard_ise_uuid="uuid_sunpinyin" country_code_URL="cn" locale_string="zh_CN"/>
+  <rec language="Chinese" language_name="简体中文" inputmode_QTY="CHINESE_QTY" inputmode_QTY_name="Qwerty键盘" main_keyboard_name="中" keyboard_ise_uuid="uuid_clm_chinese" country_code_URL="cn" locale_string="zh_CN"/>
   <rec language="Taiwan" language_name="繁體中文-註音" inputmode_QTY="ZHUYIN_QTY" inputmode_QTY_name="註音" main_keyboard_name="中" keyboard_ise_uuid="uuid_zhuyin_big" country_code_URL="tw" locale_string="zh_TW"/>
   <rec language="Hongkong" language_name="繁體中文-倉頡" inputmode_QTY="CANGJIE_QTY" inputmode_QTY_name="倉頡" main_keyboard_name="中" keyboard_ise_uuid="uuid_cangjie_3" country_code_URL="hk" locale_string="zh_HK"/>
   <rec language="Japanese" language_name="日本語" inputmode_QTY="JAPANESE_QTY" inputmode_QTY_name="Qwerty" main_keyboard_name="あ" keyboard_ise_uuid="uuid_anthy" country_code_URL="jp" locale_string="ja_JP"/>