Fix N_SE-46349

Change-Id: I1c38b95069b564b1e8e9ecd3c06d8ebc5da9d6d8

diff --git a/src/ui/controls/FUiCtrl_Keypad.cpp b/src/ui/controls/FUiCtrl_Keypad.cpp
index d7daef3..4eccb6d 100755 (executable)
--- a/src/ui/controls/FUiCtrl_Keypad.cpp
+++ b/src/ui/controls/FUiCtrl_Keypad.cpp
@@ -425,7 +425,7 @@ _Keypad::ChangeLayoutInternal(LayoutChangeState layoutChangeState)
        bool isKeypadExist = false;
        bool isClipboardExist = false;
 
-       if (__isInitialized)
+       if (__isInitialized || __pChildEdit->IsUsbKeyboardConnected())
        {
                isKeypadExist = __pChildEdit->CheckKeypadExist(orientation);
                isClipboardExist = __pChildEdit->IsClipboardExist();
@@ -707,33 +707,6 @@ _Keypad::OnActionPerformed(const _Control& source, int actionId)
                return;
        }
 
-       if (actionId == FOOTER_BACK_BUTTON_ID)
-       {
-               if (__isPredictionWindowOpendInUSBMode == false)
-               {
-                       if (__pChildEdit->IsKeypadExist() && __pChildEdit->IsClipboardExist())
-                       {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
-                               _SystemUtilImpl::SendKeyStopMessage();
-                               return;
-                       }
-
-                       if (__pChildEdit->IsKeypadExist())
-                       {
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_PRESSED, _KEY_BACK);
-                               _SystemUtilImpl::GenerateKeyEvent(KEY_EVENT_TYPE_RELEASED, _KEY_BACK);
-                               return;
-                       }
-
-                       if (__pChildEdit->IsClipboardExist())
-                       {
-                               _SystemUtilImpl::SendKeyStopMessage();
-                               return;
-                       }
-               }
-       }
-
        __pChildEdit->HideKeypad();
 
        if (__pCallerEdit)