Fix keypad enable logic

Change-Id: I7611a0ef150b0d0b03c78288f057d9395b13dd2f

diff --git a/src/ui/controls/FUiCtrl_Edit.cpp b/src/ui/controls/FUiCtrl_Edit.cpp
index 2f893b7..ab383e6 100644 (file)
--- a/src/ui/controls/FUiCtrl_Edit.cpp
+++ b/src/ui/controls/FUiCtrl_Edit.cpp
@@ -427,7 +427,7 @@ _Edit::Initialize(int editStyle, InputStyle inputStyle, int limitLength, GroupSt
        __inputStyle = inputStyle;
        if (inputStyle == INPUT_STYLE_OVERLAY)
        {
-               if (!(editStyle & EDIT_STYLE_FLEXIBLE))
+               if (!(editStyle & EDIT_STYLE_FLEXIBLE) && !(editStyle & EDIT_STYLE_VIEWER))
                {
                        _pEditPresenter->SetKeypadCommandButtonVisible(true);
                }

diff --git a/src/ui/controls/FUiCtrl_EditPresenter.cpp b/src/ui/controls/FUiCtrl_EditPresenter.cpp
index 0122734..3332fc3 100755 (executable)
--- a/src/ui/controls/FUiCtrl_EditPresenter.cpp
+++ b/src/ui/controls/FUiCtrl_EditPresenter.cpp
@@ -4966,11 +4966,6 @@ _EditPresenter::IsKeypadEnabled(void)
 {
        bool enable = true;
 
-       enable = __pEditModel->IsKeypadEnabled();
-
-       return enable;
-       /*
-       bool enable = true;
        if (__pEdit->IsEnabled())
        {
                enable = __pEditModel->IsKeypadEnabled();
@@ -4981,7 +4976,6 @@ _EditPresenter::IsKeypadEnabled(void)
        }
 
        return enable;
-       */
 }
 
 result