From 3cb52a38385f300199b939f18dfcfe76d8e2cf97 Mon Sep 17 00:00:00 2001
From: Haifeng Deng <haifeng.deng@samsung.com>
Date: Thu, 26 Feb 2015 15:33:39 +0800
Subject: [PATCH] Support Password NumberOnly layout

Change-Id: Ief7747d7cfc419dbd5182f645ca5f31e5113ac74
Signed-off-by: Haifeng Deng <haifeng.deng@samsung.com>
---
 data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml | 137 +++++++++++-----------------
 data/layout/sdk/input_mode_configure.xml    |   6 ++
 data/layout/sdk/label_property.xml          |  16 ++++
 src/include/ise.h                           |   4 +
 src/ise.cpp                                 |   2 +
 5 files changed, 83 insertions(+), 82 deletions(-)
 mode change 100644 => 100755 data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml

diff --git a/data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml b/data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml
old mode 100644
new mode 100755
index 5055c90..04e9e47
--- a/data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml
+++ b/data/layout/sdk/LYT_PORTRAIT_3X4_PASSWD.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<layout width="720" height="490" vibe_style="DEFAULT" sound_style="DEFAULT">
+<layout width="720" height="460" key_width="224" key_height="100" key_spacing="12" row_spacing="8" hit_left="4" hit_right="4" hit_top="4" hit_bottom="4" label_type="3X4_BTN_1_2" vibe_style="DEFAULT" sound_style="DEFAULT">
   <image_path>
-    <button_normal>textinput_panel_bg.png</button_normal>
+    <button_normal>B09_panel.png</button_normal>
   </image_path>
   <background_image>
-    <rec button="normal">B09_key_btn_01.png</rec>
-    <rec button="pressed">B09_key_btn_press.png</rec>
-    <rec button="disabled">B09_key_btn_01.png</rec>
+    <rec button="normal">button/B09_key_btn_01.png</rec>
+    <rec button="pressed">button/B09_key_btn_press.png</rec>
+    <rec button="disabled">button/B09_key_btn_01.png</rec>
   </background_image>
-  <row x="5" y="28" key_width="170" key_height="100">
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="5" y="28" hit_left="5" hit_right="5" hit_top="22" hit_bottom="9" label_type="label_name_6">
+  <row x="12" y="12">
+    <key>
       <label>
         <rec>1</rec>
       </label>
@@ -17,120 +17,99 @@
         <rec>1</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="185" y="28" hit_left="5" hit_right="5" hit_top="22" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
-        <rec multi="0">2</rec>
+        <rec>2</rec>
+        <rec multi="1">        ABC</rec>
       </label>
       <key_value>
         <rec>2</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="365" y="28" hit_left="5" hit_right="5" hit_top="22" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
-        <rec multi="0">3</rec>
+        <rec>3</rec>
+        <rec multi="1">        DEF</rec>
       </label>
       <key_value>
         <rec>3</rec>
       </key_value>
     </key>
-    <key button_type="selfish" key_type="control" use_magnifier="true" longkey_magnifier="true" x="545" y="28" hit_left="5" hit_right="5" hit_top="22" hit_bottom="9" use_repeat_key="true" label_type="label_name_3">
-      <image_label>
-        <rec button="normal">textinput_3x4_icon_clear2.png</rec>
-        <rec button="pressed">textinput_3x4_icon_clear2.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">B09_key_btn_02.png</rec>
-        <rec button="pressed">B09_key_btn_press.png</rec>
-        <rec button="disabled">B09_key_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>BackSpace</rec>
-      </key_value>
-    </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="5" y="147" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+  </row>
+  <row x="12">
+    <key>
       <label>
-        <rec multi="0">4</rec>
+        <rec>4</rec>
+        <rec multi="1">        GHI</rec>
       </label>
       <key_value>
         <rec>4</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="185" y="147" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
-        <rec multi="0">5</rec>
+        <rec>5</rec>
+        <rec multi="1">        JKL</rec>
       </label>
       <key_value>
         <rec>5</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="365" y="147" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
-        <rec multi="0">6</rec>
+        <rec>6</rec>
+        <rec multi="1">        MNO</rec>
       </label>
       <key_value>
         <rec>6</rec>
       </key_value>
     </key>
-    <key key_type="control" use_magnifier="true" longkey_magnifier="true" x="545" y="147" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_3">
-      <image_label>
-        <rec button="normal">textinput_3x4_icon_enter.png</rec>
-        <rec button="pressed">textinput_3x4_icon_enter.png</rec>
-      </image_label>
-      <background_image>
-        <rec button="normal">B09_key_btn_02.png</rec>
-        <rec button="pressed">B09_key_btn_press.png</rec>
-        <rec button="disabled">B09_key_btn_02.png</rec>
-      </background_image>
-      <key_value>
-        <rec>Enter</rec>
-      </key_value>
-    </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="5" y="266" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+  </row>
+  <row x="12">
+    <key>
       <label>
         <rec multi="0">7</rec>
+        <rec multi="1">        PQRS</rec>
       </label>
       <key_value>
         <rec>7</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="185" y="266" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
         <rec multi="0">8</rec>
+        <rec multi="1">        TUV</rec>
       </label>
       <key_value>
         <rec>8</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="365" y="266" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_6">
+    <key>
       <label>
         <rec multi="0">9</rec>
+        <rec multi="1">        WXYZ</rec>
       </label>
       <key_value>
         <rec>9</rec>
       </key_value>
     </key>
-    <key key_type="modechange" use_magnifier="true" longkey_magnifier="true" x="545" y="266" long_key_value="Keypad" hit_left="5" hit_right="5" hit_top="10" hit_bottom="9" label_type="label_name_3">
-      <label>
-        <rec>abc</rec>
-      </label>
+  </row>
+  <row x="12">
+    <key button_type="selfish" key_type="control" use_repeat_key="true">
+      <image_label>
+        <rec button="normal">B09_icon_back.png</rec>
+        <rec button="pressed">B09_icon_back_press.png</rec>
+      </image_label>
       <background_image>
-        <rec button="normal">B09_key_btn_02.png</rec>
-        <rec button="pressed">B09_key_btn_press.png</rec>
-        <rec button="disabled">B09_key_btn_02.png</rec>
+        <rec button="normal">button/B09_key_btn_02.png</rec>
+        <rec button="pressed">button/B09_key_btn_press.png</rec>
+        <rec button="disabled">button/B09_key_btn_02.png</rec>
       </background_image>
-      <key_event>
-        <rec>CUR_LANG</rec>
-      </key_event>
-    </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="5" y="385" hit_left="5" hit_right="5" hit_top="10" hit_bottom="5" label_type="label_name_6">
-      <label>
-        <rec>*</rec>
-      </label>
       <key_value>
-        <rec>*</rec>
+        <rec>BackSpace</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="185" y="385" hit_left="5" hit_right="5" hit_top="10" hit_bottom="5" label_type="label_name_6">
+    <key>
       <label>
         <rec>0</rec>
       </label>
@@ -138,27 +117,21 @@
         <rec>0</rec>
       </key_value>
     </key>
-    <key key_type="string" use_magnifier="true" longkey_magnifier="true" vibe_style="1" sound_style="1" x="365" y="385" hit_left="5" hit_right="5" hit_top="10" hit_bottom="5" label_type="label_name_6">
-      <label>
-        <rec>#</rec>
-      </label>
-      <key_value>
-        <rec>#</rec>
-      </key_value>
-    </key>
-    <key key_type="modechange" use_magnifier="true" longkey_magnifier="true" x="545" y="385" long_key_value="OptionWindow" hit_left="5" hit_right="5" hit_top="10" hit_bottom="5" label_type="label_name_3">
+    <key key_type="control" custom_id="Enter">
       <image_label>
-        <rec button="normal">language_icon_port.png</rec>
-        <rec button="pressed">language_icon_port.png</rec>
+        <rec button="normal">B09_icon_enter.png</rec>
+        <rec button="pressed">B09_icon_enter_press.png</rec>
+        <rec button="disabled">B09_icon_enter_dim.png</rec>
       </image_label>
       <background_image>
-        <rec button="normal">B09_key_btn_02.png</rec>
-        <rec button="pressed">B09_key_btn_press.png</rec>
-        <rec button="disabled">B09_key_btn_02.png</rec>
+        <rec button="normal">button/B09_key_btn_02.png</rec>
+        <rec button="pressed">button/B09_key_btn_press.png</rec>
+        <rec button="disabled">button/B09_key_btn_02.png</rec>
       </background_image>
-      <key_event>
-        <rec>NEXT_LANG</rec>
-      </key_event>
+      <key_value>
+        <rec>Enter</rec>
+      </key_value>
     </key>
   </row>
 </layout>
+
diff --git a/data/layout/sdk/input_mode_configure.xml b/data/layout/sdk/input_mode_configure.xml
index 9254c74..1954d49 100755
--- a/data/layout/sdk/input_mode_configure.xml
+++ b/data/layout/sdk/input_mode_configure.xml
@@ -558,6 +558,12 @@
       <landscape>LYT_LANDSCAPE_3X4_DATETIME.xml</landscape>
     </layouts>
   </mode>
+  <mode name="PASSWD_3X4">
+    <layouts>
+      <portrait>LYT_PORTRAIT_3X4_PASSWD.xml</portrait>
+      <landscape>LYT_LANDSCAPE_3X4_PASSWD.xml</landscape>
+    </layouts>
+  </mode>
   <mode name="EMOTICON_POPUP" dim_window="true">
     <layouts>
       <portrait>LYT_EMOTICON_POPUP.xml</portrait>
diff --git a/data/layout/sdk/label_property.xml b/data/layout/sdk/label_property.xml
index 31c7a7c..b5b7ea6 100755
--- a/data/layout/sdk/label_property.xml
+++ b/data/layout/sdk/label_property.xml
@@ -193,6 +193,22 @@
       </font_color_record>
     </label_properties>
   </label_properties_table>
+  <label_properties_table label_type="3X4_BTN_1_2">
+    <label_properties font_name="Tizen:style=medium" font_size="78" label_alignment="left_middle" padding_X="36" padding_Y="0">
+      <font_color_record>
+        <color button="normal">0x171717ff</color>
+        <color button="pressed">0x000000ff</color>
+        <color button="disabled">0x17171733</color>
+      </font_color_record>
+    </label_properties>
+    <label_properties font_name="Tizen:style=medium" font_size="30" label_alignment="center_middle" padding_X="0" padding_Y="0">
+      <font_color_record>
+        <color button="normal">0x0000004c</color>
+        <color button="pressed">0x0000004c</color>
+        <color button="disabled">0x0000004c</color>
+      </font_color_record>
+    </label_properties>
+  </label_properties_table>
   <label_properties_table label_type="3X4_BTN_2">
     <label_properties font_name="Tizen:style=medium" font_size="46" label_alignment="center_middle" padding_X="0" padding_Y="0">
       <font_color_record>
diff --git a/src/include/ise.h b/src/include/ise.h
index 423b5f8..b109df4 100755
--- a/src/include/ise.h
+++ b/src/include/ise.h
@@ -61,6 +61,8 @@ enum ISE_LAYOUT{
     ISE_LAYOUT_STYLE_NUMBERONLY_DEC,
     ISE_LAYOUT_STYLE_NUMBERONLY_SIGDEC,
 
+    ISE_LAYOUT_STYLE_PASSWD_3X4,
+
     ISE_LAYOUT_STYLE_MAX
 };
 
@@ -89,6 +91,8 @@ const ISE_DEFAULT_VALUES g_ise_default_values[ISE_LAYOUT_STYLE_MAX] = {
     {"NUMONLY_3X4_SIG",    "DEFAULT",   FALSE },    /* ISE_LAYOUT_STYLE_NUMBERONLY_SIG */
     {"NUMONLY_3X4_DEC",    "DEFAULT",   FALSE },    /* ISE_LAYOUT_STYLE_NUMBERONLY_DEC */
     {"NUMONLY_3X4_SIGDEC", "DEFAULT",   FALSE },    /* ISE_LAYOUT_STYLE_NUMBERONLY_SIGDEC */
+
+    {"PASSWD_3X4",         "DEFAULT",   FALSE },    /* ISE_LAYOUT_STYLE_PASSWD_3X4 */
 };
 
 #define ISE_RETURN_KEY_LABEL_DONE   gettext("IDS_IME_SK_DONE_ABB")
diff --git a/src/ise.cpp b/src/ise.cpp
index f24c438..58126e7 100755
--- a/src/ise.cpp
+++ b/src/ise.cpp
@@ -671,6 +671,8 @@ ise_show(int ic)
                     g_keyboard_state.layout_variation > 0 &&
                     g_keyboard_state.layout_variation < ISE_LAYOUT_NUMBERONLY_VARIATION_MAX) {
                     layout_index = ISE_LAYOUT_STYLE_NUMBERONLY_SIG + g_keyboard_state.layout_variation - 1;
+                } else if (g_keyboard_state.layout == ISE_LAYOUT_STYLE_PASSWORD && g_keyboard_state.layout_variation > 0) {
+                    layout_index = ISE_LAYOUT_STYLE_PASSWD_3X4;
                 }
 
                 /* If this layout requires specific input mode, set it */
-- 
2.7.4