delete activated callback for gengrid

Change-Id: I33398a236e0893d4760bd19af93b75d2154b1c3c
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/include/view/gallery-view/layout_all.h b/include/view/gallery-view/layout_all.h
index 05fb89c..8f49e75 100644 (file)
--- a/include/view/gallery-view/layout_all.h
+++ b/include/view/gallery-view/layout_all.h
@@ -20,7 +20,7 @@
 
 class CAllLayout : public CBaseLayout, CListenerMgr,
        IKeyDownListener, IMouseMoveListener, IRealizedListener,
-       IUnrealizedListener, IFocusedListener, IActivatedListener {
+       IUnrealizedListener, IFocusedListener {
 private:
        struct SAllLayout *m;
 
@@ -66,7 +66,7 @@ public:
        CAllLayout(const char *pLayoutId) : CBaseLayout(pLayoutId),
                IKeyDownListener(this), IMouseMoveListener(this),
                IRealizedListener(this), IUnrealizedListener(this),
-               IFocusedListener(this), IActivatedListener(this), m(0) {}
+               IFocusedListener(this), m(0) {}
        virtual ~CAllLayout() {}
 
        bool Create(CLayoutMgr *mgr, void *data);
@@ -86,7 +86,6 @@ public:
        void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);
-       void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item);
 };
 
 

diff --git a/include/view/gallery-view/layout_events.h b/include/view/gallery-view/layout_events.h
index c3162a1..5ddb5c5 100644 (file)
--- a/include/view/gallery-view/layout_events.h
+++ b/include/view/gallery-view/layout_events.h
@@ -19,7 +19,7 @@
 
 class CEventLayout : public CBaseLayout, CListenerMgr,
        IKeyDownListener, IMouseMoveListener, IRealizedListener,
-       IUnrealizedListener, IFocusedListener, IActivatedListener {
+       IUnrealizedListener, IFocusedListener {
 private:
        struct SEventLayout *m;
 
@@ -62,7 +62,7 @@ public:
        CEventLayout(const char *pLayoutId) : CBaseLayout(pLayoutId),
                IKeyDownListener(this), IMouseMoveListener(this),
                IRealizedListener(this), IUnrealizedListener(this),
-               IFocusedListener(this), IActivatedListener(this), m(0) {}
+               IFocusedListener(this), m(0) {}
        virtual ~CEventLayout() {}
 
        bool Create(CLayoutMgr *mgr, void *data);
@@ -84,7 +84,6 @@ public:
        void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);
-       void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item);
 };
 
 #endif

diff --git a/include/view/gallery-view/layout_folder.h b/include/view/gallery-view/layout_folder.h
index b50d3aa..98c9b80 100644 (file)
--- a/include/view/gallery-view/layout_folder.h
+++ b/include/view/gallery-view/layout_folder.h
@@ -19,7 +19,7 @@
 
 class CFolderLayout : public CBaseLayout, CListenerMgr,
        IKeyDownListener, IMouseMoveListener, IRealizedListener,
-       IUnrealizedListener, IFocusedListener, IActivatedListener {
+       IUnrealizedListener, IFocusedListener {
 private:
        struct SFolderLayout *m;
 
@@ -59,7 +59,7 @@ public:
        CFolderLayout(const char *pLayoutId) : CBaseLayout(pLayoutId),
                IKeyDownListener(this), IMouseMoveListener(this),
                IRealizedListener(this), IUnrealizedListener(this),
-               IFocusedListener(this), IActivatedListener(this), m(0) {}
+               IFocusedListener(this), m(0) {}
        virtual ~CFolderLayout() {}
 
        bool Create(CLayoutMgr *mgr, void *data);
@@ -81,7 +81,6 @@ public:
        void OnRealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnUnrealized(int id, Evas_Object *obj, Elm_Object_Item *item);
        void OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item);
-       void OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item);
 };
 
 #endif

diff --git a/src/view/gallery-view/layout_all.cpp b/src/view/gallery-view/layout_all.cpp
index 74f2f8d..742fc3b 100644 (file)
--- a/src/view/gallery-view/layout_all.cpp
+++ b/src/view/gallery-view/layout_all.cpp
@@ -336,7 +336,7 @@ Evas_Object *CAllLayout::m_DrawGengrid(Evas_Object *layout)
                        elm_config_scale_get() * GENGRID_ITEM_SIZE_H);
 
        Connect(grid, ALL_GRID, TYPE_KEY_DOWN | TYPE_MOUSE_MOVE | TYPE_REALIZED
-                       | TYPE_UNREALIZED | TYPE_FOCUSED | TYPE_ACTIVATED);
+                       | TYPE_UNREALIZED | TYPE_FOCUSED);
 
        return grid;
 }
@@ -740,14 +740,3 @@ void CAllLayout::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item)
                break;
        }
 }
-
-void CAllLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item)
-{
-       switch (id) {
-       case ALL_GRID:
-               m_OnGridActivated(item, NULL, NULL);
-               break;
-       default:
-               break;
-       }
-}

diff --git a/src/view/gallery-view/layout_events.cpp b/src/view/gallery-view/layout_events.cpp
index 8875f58..3d81697 100644 (file)
--- a/src/view/gallery-view/layout_events.cpp
+++ b/src/view/gallery-view/layout_events.cpp
@@ -397,7 +397,7 @@ Evas_Object *CEventLayout::m_DrawGengrid(Evas_Object *layout)
                elm_config_scale_get() * GENGRID_ITEM_SIZE_H);
 
        Connect(grid, EVENT_GRID, TYPE_KEY_DOWN | TYPE_MOUSE_MOVE | TYPE_REALIZED
-                       | TYPE_UNREALIZED | TYPE_FOCUSED | TYPE_ACTIVATED);
+                       | TYPE_UNREALIZED | TYPE_FOCUSED);
 
        return grid;
 }
@@ -816,14 +816,3 @@ void CEventLayout::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item)
                break;
        }
 }
-
-void CEventLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item)
-{
-       switch (id) {
-       case EVENT_GRID:
-               m_OnGridActivated(item, NULL, NULL);
-               break;
-       default:
-               break;
-       }
-}

diff --git a/src/view/gallery-view/layout_folder.cpp b/src/view/gallery-view/layout_folder.cpp
index 0ec7529..ce3eac2 100644 (file)
--- a/src/view/gallery-view/layout_folder.cpp
+++ b/src/view/gallery-view/layout_folder.cpp
@@ -271,7 +271,7 @@ Evas_Object *CFolderLayout::m_DrawGengrid(Evas_Object *layout)
                elm_config_scale_get() * GENGRID_ITEM_SIZE_H);
 
        Connect(grid, FOLDER_GRID, TYPE_KEY_DOWN | TYPE_MOUSE_MOVE | TYPE_REALIZED
-                       | TYPE_UNREALIZED | TYPE_FOCUSED | TYPE_ACTIVATED);
+                       | TYPE_UNREALIZED | TYPE_FOCUSED);
 
        return grid;
 }
@@ -632,14 +632,3 @@ void CFolderLayout::OnFocused(int id, Evas_Object *obj, Elm_Object_Item *item)
                break;
        }
 }
-
-void CFolderLayout::OnActivated(int id, Evas_Object *obj, Elm_Object_Item *item)
-{
-       switch (id) {
-       case FOLDER_GRID:
-               m_OnGridActivated(item, NULL, NULL);
-               break;
-       default:
-               break;
-       }
-}