Merge "Fix DCM-1933" into tizen_2.2

diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp
index 285f705..8de4f56 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Keypad.cpp
+++ b/src/ui/controls/FUiCtrl_Keypad.cpp
@@ -174,6 +174,7 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe
                String doneText;
                String cancelText;
                _AccessibilityContainer* pAccessibilityContainer = null;
+               Variant variantKeypadStyle = (int)keypadStyleInfo.keypadStyle;
 
                GET_STRING_CONFIG(IDS_TPLATFORM_BUTTON_DONE, doneText);
                GET_STRING_CONFIG(IDS_TPLATFORM_BUTTON_CANCEL_ABB, cancelText);
@@ -185,7 +186,8 @@ _Keypad::Initialize(int editStyle, _KeypadStyleInfo keypadStyleInfo, int limitLe
 
                __pChildEdit->SetTextPredictionEnabled(keypadStyleInfo.textPredictionEnabled);
                __pChildEdit->SetKeypadNormalNumberStyle(keypadStyleInfo.isNormalNumberStyle);
-               __pChildEdit->SetKeypadStyle(keypadStyleInfo.keypadStyle);
+               __pChildEdit->SetPropertyKeypadStyle(variantKeypadStyle);
+
                if (!keypadStyleInfo.enterActionEnabled)//EditField Style
                {
                        __pChildEdit->SetKeypadActionEnabled(false);