N_SE-43925

Change-Id: I120ddd9725a8533d573981a2fad189a18d14886b

diff --git a/inc/GlAlbumListForm.h b/inc/GlAlbumListForm.h
index 8e2a988..0112319 100644 (file)
--- a/inc/GlAlbumListForm.h
+++ b/inc/GlAlbumListForm.h
@@ -22,6 +22,7 @@
 #ifndef _GL_ALBUM_LIST_FORM_H_
 #define _GL_ALBUM_LIST_FORM_H_
 
+#include <FApp.h>
 #include <FUi.h>
 #include "GlAlbumEventListener.h"
 #include "GlFormContentUpdateEventListener.h"
@@ -31,6 +32,7 @@ class AlbumListPresentationModel;
 class AlbumListForm
        : public IAlbumEventListener
        , public IFormContentUpdateEventListener
+       , public Tizen::App::IAppControlResponseListener
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::IOrientationEventListener
        , public Tizen::Ui::Controls::Form
@@ -73,6 +75,10 @@ public:
        virtual void OnFileInfoChanged(const Tizen::Content::ContentType contentType);
        virtual void OnThumbnailDecoded(const int index);
 
+       virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
+                               const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
+                               const Tizen::Base::Collection::IMap* pExtraData);
+
 private:
        result InitializeHeader(void);
        result InitializeFooter(void);

diff --git a/inc/GlFileListForm.h b/inc/GlFileListForm.h
index 3857118..45d3536 100644 (file)
--- a/inc/GlFileListForm.h
+++ b/inc/GlFileListForm.h
@@ -22,6 +22,7 @@
 #ifndef _GL_FILE_LIST_FORM_H_
 #define _GL_FILE_LIST_FORM_H_
 
+#include <FApp.h>
 #include <FUi.h>
 #include "GlFormContentUpdateEventListener.h"
 #include "GlSlideSettingListener.h"
@@ -33,6 +34,7 @@ class SlideShowPopUp;
 class FileListForm
        : public IFormContentUpdateEventListener
        , public ISlideSettingListener
+       , public Tizen::App::IAppControlResponseListener
        , public Tizen::Ui::IActionEventListener
        , public Tizen::Ui::Controls::Form
        , public Tizen::Ui::Controls::IFormBackEventListener
@@ -59,6 +61,10 @@ public:
 
        virtual void OnFormMenuRequested (Tizen::Ui::Controls::Form &source);
 
+       virtual void OnAppControlCompleteResponseReceived(const Tizen::App::AppId& appId,
+                               const Tizen::Base::String& operationId, Tizen::App::AppCtrlResult appControlResult,
+                               const Tizen::Base::Collection::IMap* pExtraData);
+
        void SetMenuState(bool state);
 
 private:

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index 2a41143..d6f76a8 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -349,7 +349,7 @@ AlbumListForm::OnActionPerformed(const Control& source, int actionId)
                                new (std::nothrow) String(APPCONTROL_DATA_TRUE));
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA,
                                APPCONTROL_OPERATION_ID_CREATE_CONTENT, null,
-                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
+                               new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, this);
        }
        break;
 
@@ -490,6 +490,17 @@ AlbumListForm::OnThumbnailDecoded(const int index)
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 
+void
+AlbumListForm::OnAppControlCompleteResponseReceived(const AppId& appId, const Tizen::Base::String& operationId,
+                       AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
+{
+       AppLogDebug("OnAppControlCompleteResponseReceived : %d", appControlResult);
+
+       GalleryApp* pGalleryApp = static_cast<GalleryApp*>(GalleryApp::GetInstance());
+       TryReturnVoid(pGalleryApp != null, "pGalleryApp is null");
+       pGalleryApp->SetFrameEnabled(true);
+}
+
 result
 AlbumListForm::Update(void)
 {
@@ -561,9 +572,3 @@ AlbumListForm::OnOrientationChanged(const Tizen::Ui::Control &source, Tizen::Ui:
        AddControl(*__pAlbumViewIconList);
 
 }
-
-
-
-
-
-

diff --git a/src/GlFileListForm.cpp b/src/GlFileListForm.cpp
index d3ba711..4a9d3ac 100644 (file)
--- a/src/GlFileListForm.cpp
+++ b/src/GlFileListForm.cpp
@@ -165,7 +165,7 @@ FileListForm::OnActionPerformed(const Control& source, int actionId)
                pDataList->Construct();
                pDataList->Add(new (std::nothrow) String(APPCONTROL_KEY_CAMERA_ALLOW_SWITCH), new (std::nothrow) String(APPCONTROL_DATA_TRUE));
                __pPresentationModel->StartAppControl(APPCONTROL_PROVIDER_ID_CAMERA, APPCONTROL_OPERATION_ID_CREATE_CONTENT,
-                               null, new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, null);
+                               null, new (std::nothrow) String(APPCONTROL_MIME_IMAGE_JPG), pDataList, this);
        }
        break;
 
@@ -336,3 +336,14 @@ FileListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
        }
 
 }
+
+void
+FileListForm::OnAppControlCompleteResponseReceived(const AppId& appId, const Tizen::Base::String& operationId,
+                       AppCtrlResult appControlResult, const Tizen::Base::Collection::IMap* pExtraData)
+{
+       AppLogDebug("OnAppControlCompleteResponseReceived : %d", appControlResult);
+
+       GalleryApp* pGalleryApp = static_cast<GalleryApp*>(GalleryApp::GetInstance());
+       TryReturnVoid(pGalleryApp != null, "pGalleryApp is null");
+       pGalleryApp->SetFrameEnabled(true);
+}