Revert "Apply resume/pause"

This reverts commit ed6cf75651de0da8da3fa0c438e133175ae872e4.

Change-Id: Ic6823a446c6d886a41df598fcee97b61565bc023
Signed-off-by: HeeJu Kang <mobum.kang@samsung.com>

diff --git a/src/FShell_AppWidgetLayer.cpp b/src/FShell_AppWidgetLayer.cpp
index 5f82787..179e5f6 100644 (file)
--- a/src/FShell_AppWidgetLayer.cpp
+++ b/src/FShell_AppWidgetLayer.cpp
@@ -20,8 +20,6 @@
  */
 
 #include <new>
-#include <errno.h>\r
-#include <string.h>
 #include <sys/shm.h>
 #include <X11/Xlib.h>
 #include <X11/extensions/XShm.h>
@@ -37,8 +35,6 @@
 #include "FShell_AppWidgetLayer.h"
 #include "FShell_AppWidgetProviderManagerImpl.h"
 
-//#define _BUFFER_TEST
-
 using namespace std;
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
@@ -254,26 +250,6 @@ _AppWidgetLayer::SyncPixmap(const FloatDimension& size)
 
        memcpy(pXImage->data, __pRenderBuffer, __bufferSize);
 
-#if defined(_BUFFER_TEST)
-       {
-               FILE* pFile = null;\r
-               static int idx = 0;\r
-               char filename[1024];\r
-               snprintf(filename, sizeof(filename), "/opt/out%d.raw", idx++);\r
-               pFile = fopen(filename, "w+b");\r
-               if (pFile)\r
-               {\r
-                       fwrite(__pRenderBuffer, __bufferSize, 1, pFile);\r
-                       fclose(pFile);\r
-                       SysLog(NID_UI_CTRL, "_BUFFER_TEST: buffer (0x%x) size (%d) pixmapId (%d) width(%f) height(%f)", __pRenderBuffer, __bufferSize, __pixmapId, size.width, size.height);\r
-               }\r
-               else\r
-               {\r
-                       SysLog(NID_UI_CTRL, "File open failed: (%s) buffer (0x%x) size (%d) pixmapId (%d)", strerror(errno), __pRenderBuffer, __bufferSize, __pixmapId);\r
-               }\r
-       }
-#endif // _BUFFER_TEST
-
        // Do not send the event. Instead of X event, master will send the updated event to the viewer
        XShmPutImage(pDisplay, static_cast<Pixmap>(__pixmapId), gc, pXImage, 0, 0, 0, 0, size.width, size.height, False);
        XSync(pDisplay, False);

diff --git a/src/FShell_AppWidgetPopupView.cpp b/src/FShell_AppWidgetPopupView.cpp
index 815f7db..5b1e849 100644 (file)
--- a/src/FShell_AppWidgetPopupView.cpp
+++ b/src/FShell_AppWidgetPopupView.cpp
@@ -37,13 +37,13 @@
 #include <FGrp_BitmapImpl.h>
 #include <FMedia_ImageDecoder.h>
 #include <FUi_ControlManager.h>
-#include <FUi_CoordinateSystemUtils.h>
-#include <FUi_Types.h>
 #include <FUiAnim_EflNode.h>
 #include <FUiAnim_VisualElement.h>
 #include <FUiAnim_VisualElementImpl.h>
 #include <FUiAnim_VisualElementSurfaceImpl.h>
+#include <FUi_CoordinateSystemUtils.h>
 #include <FUiCtrl_Frame.h>
+#include <FUi_Types.h>
 #include "FShell_AppWidgetPopupView.h"
 #include "FShell_AppWidgetPopupViewPresenter.h"
 #include "FShell_AppWidgetPopupViewEvent.h"

diff --git a/src/FShell_AppWidgetView.cpp b/src/FShell_AppWidgetView.cpp
index a9a62e3..456ad4b 100644 (file)
--- a/src/FShell_AppWidgetView.cpp
+++ b/src/FShell_AppWidgetView.cpp
@@ -34,19 +34,18 @@
 #include <FBase_StringConverter.h>
 #include <FGrp_BitmapImpl.h>
 #include <FMedia_ImageDecoder.h>
-#include <FUi_TouchFlickGestureDetector.h>
-#include <FUi_ResourceManager.h>
-#include <FUi_CoordinateSystemUtils.h>
-#include <FUiAnim_EflNode.h>
-#include <FUiAnim_VisualElementImpl.h>
-#include <FUiAnim_VisualElementSurfaceImpl.h>
-#include <FUiCtrl_Frame.h>
+#include "FUi_TouchFlickGestureDetector.h"
 #include "FShell_IAppWidgetViewEventListener.h"
 #include "FShell_AppWidgetManagerImpl.h"
 #include "FShell_AppWidgetView.h"
 #include "FShell_AppWidgetViewPresenter.h"
 #include "FShell_AppWidgetPopupView.h"
 #include "FShell_AppWidgetViewManager.h"
+#include "FUi_ResourceManager.h"
+#include "FUiAnim_EflNode.h"
+#include "FUiAnim_VisualElementImpl.h"
+#include "FUiAnim_VisualElementSurfaceImpl.h"
+#include "FUi_CoordinateSystemUtils.h"
 
 using namespace std;
 using namespace Tizen::App;
@@ -428,18 +427,6 @@ _AppWidgetView::OnAttachedToMainTree(void)
 {
        result r = E_SUCCESS;
 
-       _Window* pWindow = _ControlManager::GetInstance()->GetCurrentFrame();
-       if (pWindow)
-       {
-               _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
-               if (pFrame)
-               {
-                       pFrame->AddFrameEventListener(*this);
-               }
-
-               __pAppWidgetViewManager->AddFrameEventListener();
-       }
-
        return r;
 }
 
@@ -448,16 +435,6 @@ _AppWidgetView::OnDetachingFromMainTree(void)
 {
        result r = E_SUCCESS;
 
-       _Window* pWindow = _ControlManager::GetInstance()->GetCurrentFrame();
-       if (pWindow)
-       {
-               _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
-               if (pFrame)
-               {
-                       pFrame->RemoveFrameEventListener(*this);
-               }
-       }
-
        return r;
 }
 
@@ -588,34 +565,6 @@ _AppWidgetView::OnDraw(void)
 }
 
 void
-_AppWidgetView::OnFrameActivated(const Tizen::Ui::Controls::_Frame& source)
-{
-       if (__pAppWidget)
-       {
-               livebox_set_visibility(__pAppWidget, LB_SHOW);
-       }
-}
-
-void
-_AppWidgetView::OnFrameDeactivated(const Tizen::Ui::Controls::_Frame& source)
-{
-       if (__pAppWidget)
-       {
-               livebox_set_visibility(__pAppWidget, LB_HIDE_WITH_PAUSE);
-       }
-}
-
-void
-_AppWidgetView::OnFrameMinimized(const Tizen::Ui::Controls::_Frame& source)
-{
-}
-
-void
-_AppWidgetView::OnFrameRestored(const Tizen::Ui::Controls::_Frame& source)
-{
-}
-
-void
 _AppWidgetView::OnAppWidgetUpdated(const Bitmap& bitmap, const FloatDimension& size)
 {
        __resizeFromRemote = true;

diff --git a/src/FShell_AppWidgetView.h b/src/FShell_AppWidgetView.h
index 45de955..525c394 100644 (file)
--- a/src/FShell_AppWidgetView.h
+++ b/src/FShell_AppWidgetView.h
@@ -30,7 +30,6 @@
 #include <FAppTypes.h>
 #include <FBaseColIListT.h>
 #include <FUiAnimIVisualElementAnimationStatusEventListener.h>
-#include <FUiCtrl_IFrameEventListener.h>
 #include "FUi_Control.h"
 #include "FUi_ITouchFlickGestureEventListener.h"
 #include "FUiAnim_VisualElement.h"
@@ -70,7 +69,6 @@ class _AppWidgetView
        , public Tizen::Ui::Animations::IVisualElementAnimationStatusEventListener
        , public Tizen::Ui::_ITouchFlickGestureEventListener
        , public _IAppWidgetPopupViewEventListener
-       , public Tizen::Ui::Controls::_IFrameEventListener
 {
 public:
        static _AppWidgetView* CreateAppWidgetViewN(void);
@@ -120,10 +118,6 @@ private:
        virtual void OnAppWidgetPopupViewOpened(void);
        virtual void OnAppWidgetPopupViewClosed(void);
        virtual void OnDraw(void);
-       virtual void OnFrameActivated(const Tizen::Ui::Controls::_Frame& source);
-       virtual void OnFrameDeactivated(const Tizen::Ui::Controls::_Frame& source);
-       virtual void OnFrameMinimized(const Tizen::Ui::Controls::_Frame& source);
-       virtual void OnFrameRestored(const Tizen::Ui::Controls::_Frame& source);
 
        void OnAppWidgetUpdated(const Tizen::Graphics::Bitmap& bitmap, const Tizen::Graphics::FloatDimension& size);
        void OnAppWidgetUpdated(int pixmap);

diff --git a/src/FShell_AppWidgetViewManager.cpp b/src/FShell_AppWidgetViewManager.cpp
index a0b2833..6f3eee1 100644 (file)
--- a/src/FShell_AppWidgetViewManager.cpp
+++ b/src/FShell_AppWidgetViewManager.cpp
@@ -43,9 +43,6 @@ extern "C"
 #include <FGrp_BitmapImpl.h>
 #include <FGrp_CoordinateSystem.h>
 #include <FMedia_ImageDecoder.h>
-#include <FUi_ControlManager.h>
-#include <FUiCtrl_Frame.h>
-#include <FUiCtrl_IFrameEventListener.h>
 #include "FShell_AppWidgetViewManager.h"
 #include "FShell_AppWidgetView.h"
 #include "FShell_AppWidgetPopupView.h"
@@ -74,8 +71,6 @@ using namespace Tizen::Base;
 using namespace Tizen::Base::Collection;
 using namespace Tizen::Graphics;
 using namespace Tizen::Media;
-using namespace Tizen::Ui;
-using namespace Tizen::Ui::Controls;
 
 namespace
 {
@@ -438,27 +433,6 @@ _AppWidgetViewManager::SetAppWidgetSize(const _AppWidgetView& appwidgetView, con
        livebox_resize(pAppWidget, sizeType, OnAppWidgetResized, this);
 }
 
-void
-_AppWidgetViewManager::AddFrameEventListener(void)
-{
-       if (!__pFrameEventListener)
-       {
-               unique_ptr<_FrameEventListener> pFrameEventListener(new (std::nothrow) _FrameEventListener());
-               SysTryReturnVoidResult(NID_UI_CTRL, pFrameEventListener, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] Memory is insufficient.");
-
-               _Window* pWindow = _ControlManager::GetInstance()->GetCurrentFrame();
-               SysTryReturnVoidResult(NID_UI_CTRL, pWindow, E_INVALID_ARG, "[E_INVALID_ARG] The argument is invalid.");
-
-               __pFrameEventListener = move(pFrameEventListener);
-
-               _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
-               if (pFrame)
-               {
-                       pFrame->AddFrameEventListener(*__pFrameEventListener);
-               }
-       }
-}
-
 _AppWidgetViewManager::_AppWidgetViewManager(void)
        : __glMode(false)
 {
@@ -489,19 +463,6 @@ _AppWidgetViewManager::_AppWidgetViewManager(void)
 
 _AppWidgetViewManager::~_AppWidgetViewManager(void)
 {
-       _ControlManager* pControlManager = _ControlManager::GetInstance();
-       if (pControlManager && __pFrameEventListener)
-       {
-               _Window* pWindow = pControlManager->GetCurrentFrame();
-               if (pWindow)
-               {
-                       _Frame* pFrame = dynamic_cast<_Frame*>(pWindow);
-                       if (pFrame)
-                       {
-                               pFrame->RemoveFrameEventListener(*__pFrameEventListener);
-                       }
-               }
-       }
 }
 
 int
@@ -865,28 +826,4 @@ _AppWidgetViewManager::OnAppWidgetResized(livebox* pAppWidget, int ret, void* pD
        pAppWidgetViewManager->OnAppWidgetUpdated(pAppWidget);
 }
 
-void
-_AppWidgetViewManager::_FrameEventListener::OnFrameActivated(const Tizen::Ui::Controls::_Frame& source)
-{
-       int ret = livebox_client_resumed();
-       SysLog(NID_UI_CTRL, "ret (%d)", ret);
-}
-
-void
-_AppWidgetViewManager::_FrameEventListener::OnFrameDeactivated(const Tizen::Ui::Controls::_Frame& source)
-{
-       int ret = livebox_client_paused();
-       SysLog(NID_UI_CTRL, "ret (%d)", ret);
-}
-
-void
-_AppWidgetViewManager::_FrameEventListener::OnFrameMinimized(const Tizen::Ui::Controls::_Frame& source)
-{
-}
-
-void
-_AppWidgetViewManager::_FrameEventListener::OnFrameRestored(const Tizen::Ui::Controls::_Frame& source)
-{
-}
-
 }} // Tizen::Shell

diff --git a/src/FShell_AppWidgetViewManager.h b/src/FShell_AppWidgetViewManager.h
index 2def690..8353f5b 100644 (file)
--- a/src/FShell_AppWidgetViewManager.h
+++ b/src/FShell_AppWidgetViewManager.h
@@ -65,7 +65,6 @@ public:
        Tizen::Graphics::FloatDimension GetAppWidgetSize(livebox* pAppWidget) const;
        Tizen::Graphics::FloatDimension GetAppWidgetPopupSize(livebox* pAppWidget) const;
        void SetAppWidgetSize(const _AppWidgetView& appwidgetView, const Tizen::Graphics::FloatDimension& size);
-       void AddFrameEventListener(void);
 
 private:
        _AppWidgetViewManager(void);
@@ -92,16 +91,6 @@ private:
        static void OnAppWidgetDeleted(livebox *pAppWidget, int ret, void* pData);
        static void OnAppWidgetResized(livebox* pAppWidget, int ret, void* pData);
 
-       class _FrameEventListener
-               : public Tizen::Ui::Controls::_IFrameEventListener
-       {
-       private:
-               virtual void OnFrameActivated(const Tizen::Ui::Controls::_Frame& source);
-               virtual void OnFrameDeactivated(const Tizen::Ui::Controls::_Frame& source);
-               virtual void OnFrameMinimized(const Tizen::Ui::Controls::_Frame& source);
-               virtual void OnFrameRestored(const Tizen::Ui::Controls::_Frame& source);
-       };
-
 private:
        struct _EventHandlerDeleter
        {
@@ -127,7 +116,6 @@ private:
        std::unique_ptr<Tizen::Graphics::_ICoordinateSystemTransformer> __pCoordinateTransformer;
        std::unique_ptr<int, _EventHandlerDeleter> __eventHandler;
        std::unique_ptr<int, _FaultEventHandlerDeleter> __faultEventHandler;
-       std::unique_ptr<_FrameEventListener> __pFrameEventListener;
        bool __glMode;
 };