Fixed issue 55281

Change-Id: I80a0597d53feafe29b36ae571cc0d889b0372e65
Signed-off-by: Himanshu <himanshu.t@samsung.com>

diff --git a/inc/GlAlbumNameEditorForm.h b/inc/GlAlbumNameEditorForm.h
index 759b887..e82dbfb 100644 (file)
--- a/inc/GlAlbumNameEditorForm.h
+++ b/inc/GlAlbumNameEditorForm.h
@@ -73,7 +73,7 @@ public:
        //IKeypadEventListener
        virtual void OnKeypadActionPerformed(Tizen::Ui::Control& source, Tizen::Ui::KeypadAction keypadAction){};
        virtual void OnKeypadClosed(Tizen::Ui::Control& source);
-       virtual void OnKeypadOpened(Tizen::Ui::Control& source){};
+       virtual void OnKeypadOpened(Tizen::Ui::Control& source);
        virtual void OnKeypadWillOpen(Tizen::Ui::Control& source){};
 
        virtual void OnFileOpInvalidate(enum FileActionMode actionId);
@@ -101,6 +101,7 @@ private:
        int __textLength;
        bool __mountState;
        bool __isCreateAlbum;
+       bool __isKeyPadOpen;
        AlbumNameEditorMode __albumNameEditorMode;
        Tizen::Ui::Scenes::SceneId __callerSceneId;
        Tizen::Ui::Scenes::SceneId __previousSceneId;

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index fcbb168..4fbd766 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -55,6 +55,7 @@ AlbumNameEditorForm::AlbumNameEditorForm(void)
        , __textLength(0)
        , __mountState(false)
     , __isCreateAlbum(false)
+    , __isKeyPadOpen(false)
        , __albumNameEditorMode(ALBUM_NAME_EDITOR_MODE_RENAME)
        , __pMessageBox(null)
        , __pMoveIndexList(null)
@@ -497,8 +498,15 @@ AlbumNameEditorForm::OnActionPerformed(const Control& source, int actionId)
 
                if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_CREATE)
                {
+                       if (__isKeyPadOpen == true )
+                       {
                        __pNameEditField->HideKeypad();
                        __isCreateAlbum = true;
+                       }
+                       else
+                       {
+                               OnCreateAlbum();
+                       }
 
                }
                else if (__albumNameEditorMode == ALBUM_NAME_EDITOR_MODE_RENAME)
@@ -686,6 +694,8 @@ AlbumNameEditorForm::OnSceneDeactivated(const SceneId& currentSceneId,
                __pNameEditField->SetEnabled(true);
        }
 
+       __isKeyPadOpen = false;
+
        __pPresentationModel->RemoveContentEventListener(*this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -764,11 +774,21 @@ AlbumNameEditorForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tize
 void
 AlbumNameEditorForm::OnKeypadClosed(Tizen::Ui::Control& source)
 {
+       AppLogDebug("ENTER");
 
        if ( __isCreateAlbum == true)
        {
                OnCreateAlbum();
        __isCreateAlbum = false;
        }
+       __isKeyPadOpen = false;
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
+void
+AlbumNameEditorForm::OnKeypadOpened(Tizen::Ui::Control& source)
+{
+       AppLogDebug("ENTER");
+       __isKeyPadOpen = true;
+       AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
+}