Applied the remote controller key mapping.

Change-Id: I82dde63f36733ed793569a127454b661de371b0d
Signed-off-by: Hyojung Jo <hj903.jo@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d367784..ab1d49f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,6 @@ pkg_check_modules(PKGS REQUIRED
                edje
                evas
                ecore-x
-               efl-extension
                x11
                pkgmgr-info
                pkgmgr

diff --git a/include/AppsBaseLayout.h b/include/AppsBaseLayout.h
index 171ffb0..f7c6f16 100644 (file)
--- a/include/AppsBaseLayout.h
+++ b/include/AppsBaseLayout.h
@@ -37,14 +37,11 @@ private:
 private:
        static void sm_CbThumbnailDeleted(void *data, Evas *e, Evas_Object *obj,
                        void *ei);
-       static int sm_CbSortThumbs(const void *first_data,
-                       const void *second_data);
        static int sm_CbAppList(pkgmgrinfo_appinfo_h handle, void *data);
        static void sm_CbPackageUpdated(const char *type, const char *package,
                        package_manager_event_type_e event_type,
                        package_manager_event_state_e event_state, int progress,
                        package_manager_error_e error, void *user_data);
-       static void sm_CbThumbnailBack(void *data, Evas_Object* obj, void *ev);
 
 private:
        Evas_Object *m_LoadAppInfo(Evas_Object *obj, char *name, char *icon);

diff --git a/include/AppsBaseView.h b/include/AppsBaseView.h
index 53e1d14..1251cc6 100644 (file)
--- a/include/AppsBaseView.h
+++ b/include/AppsBaseView.h
@@ -36,7 +36,6 @@ private:
        bool m_DrawFullView();
 
 private:
-       static void sm_CbBaseBack(void *data, Evas_Object *obj, void *ev);
        static void sm_CbCtxPopupSelected(void *cookie, CCtxPopup *instance, const char *text);
 
 protected:

diff --git a/include/ContextView.h b/include/ContextView.h
index 6a41715..90e8514 100644 (file)
--- a/include/ContextView.h
+++ b/include/ContextView.h
@@ -33,12 +33,6 @@ private:
        struct SContextView *m;
 
 private:
-       static void sm_CbThumbnailFocused(void *data, Evas_Object *obj, void *ev);
-       static void sm_CbThumbnailUnfocused(void *data, Evas_Object *obj, void *ev);
-       static void sm_CbBaseViewCalled(void *data, Evas *e, Evas_Object *obj, void *ei);
-       static void sm_CbBaseBack(void *data, Evas_Object *obj, void *ev);
-       static void sm_CbCtgrBtnBack(void *data, Evas_Object *obj, void *ev);
-       static void sm_CbPopupBack(void *data, Evas_Object *obj, void *ev);
        static int sm_CbAppList(pkgmgrinfo_appinfo_h handle, void *data);
 
 private:

diff --git a/include/define.h b/include/define.h
index ad90c89..bf14ad8 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -24,6 +24,9 @@
 #define KEY_ENTER "Return"
 #define KEY_MENU "Super_L"
 #define KEY_BACK "Escape"
+#define KEY_ENTER_REMOTE "KP_Enter"
+#define KEY_BACK_REMOTE "XF86Close"
+#define KEY_MENU_REMOTE "XF86MenuKB"
 
 #define APPS_BASE_VIEW "APPS_BASE_VIEW"
 #define APPS_CONTEXT_VIEW "APPS_CONTEXT_VIEW"

diff --git a/packaging/org.tizen.app-launcher-tv-ref.spec b/packaging/org.tizen.app-launcher-tv-ref.spec
index f86cd77..a7773ef 100644 (file)
--- a/packaging/org.tizen.app-launcher-tv-ref.spec
+++ b/packaging/org.tizen.app-launcher-tv-ref.spec
@@ -15,7 +15,6 @@ BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(db-util)
 BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(edje)
 BuildRequires: pkgconfig(elementary)
 BuildRequires: pkgconfig(pkgmgr)

diff --git a/src/layout/AppsBaseLayout.cpp b/src/layout/AppsBaseLayout.cpp
index 98e3f7d..f329bfb 100644 (file)
--- a/src/layout/AppsBaseLayout.cpp
+++ b/src/layout/AppsBaseLayout.cpp
@@ -17,7 +17,6 @@
 #include <Elementary.h>
 #include <Eina.h>
 #include <aul.h>
-#include <efl_extension.h>
 #include <BaseView.h>
 #include <ail.h>
 #include <ViewMgr.h>
@@ -106,7 +105,7 @@ void CAppsBaseLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Ke
                }
 
                return;
-       } else if (!strcmp(ev->keyname, KEY_BACK)) {
+       } else if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
                action = E_FOCUS_MENU;
                m->vmgr->UpdateView((const char *)APPS_BASE_VIEW, (void *)&action);
                return;
@@ -118,7 +117,7 @@ void CAppsBaseLayout::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Ke
                action = E_FOCUS_SORT;
                m->vmgr->UpdateView((const char *)APPS_BASE_VIEW, (void *)&action);
                return;
-       } else if (!strcmp(ev->keyname, KEY_MENU)) {
+       } else if (!strcmp(ev->keyname, KEY_MENU) || !strcmp(ev->keyname, KEY_MENU_REMOTE)) {
                if (!m->vmgr->PushView(APPS_CONTEXT_VIEW, ainfo))
                        _ERR("Push context view failed.");
        }
@@ -318,14 +317,6 @@ Evas_Object *CAppsBaseLayout::m_LoadAppInfo(Evas_Object *obj, char *name,
        return ly;
 }
 
-void CAppsBaseLayout::sm_CbThumbnailBack(void *data, Evas_Object *obj, void *ev)
-{
-       SAppsBaseLayout *m = (SAppsBaseLayout *)data;
-       update_type action = E_FOCUS_MENU;
-
-       m->vmgr->UpdateView((const char *)APPS_BASE_VIEW, (void *)&action);
-}
-
 /**
  * @Packs the app thumbnail object to the table.
  *
@@ -389,8 +380,6 @@ void CAppsBaseLayout::m_PackThumbnail(CAppInfo *ainfo)
 
        evas_object_event_callback_add(thumb, EVAS_CALLBACK_DEL,
                        sm_CbThumbnailDeleted, pkgname_ptr);
-       eext_object_event_callback_add(thumb, EEXT_CALLBACK_BACK,
-                       sm_CbThumbnailBack, m);
 }
 
 /**

diff --git a/src/view/AppsBaseView.cpp b/src/view/AppsBaseView.cpp
index b0364b1..3ca6fcf 100644 (file)
--- a/src/view/AppsBaseView.cpp
+++ b/src/view/AppsBaseView.cpp
@@ -17,7 +17,6 @@
 #include <Elementary.h>
 #include <app.h>
 #include <stdlib.h>
-#include <efl_extension.h>
 #include <BaseView.h>
 #include <ViewMgr.h>
 #include <BaseLayout.h>
@@ -316,11 +315,6 @@ bool CAppsBaseView::m_DrawFullView(void)
        return true;
 }
 
-void CAppsBaseView::sm_CbBaseBack(void *data, Evas_Object *obj, void *ev)
-{
-       elm_exit();
-}
-
 /**
  * @Initializes the base layout for app list view.
  */
@@ -388,9 +382,6 @@ bool CAppsBaseView::Create(void *data)
                return false;
        }
 
-       eext_object_event_callback_add(m->base, EEXT_CALLBACK_BACK,
-                       sm_CbBaseBack, NULL);
-
        if (!m->lmgr->Show(APPS_BASE_LAYOUT))
                _ERR("Failed to load base layout.");
 

diff --git a/src/view/ContextView.cpp b/src/view/ContextView.cpp
index 5d7e179..5301de7 100644 (file)
--- a/src/view/ContextView.cpp
+++ b/src/view/ContextView.cpp
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <pkgmgr-info.h>
 #include <package-manager.h>
-#include <efl_extension.h>
 #include <ViewMgr.h>
 #include <BaseView.h>
 #include <AppCommon.h>
@@ -253,9 +252,11 @@ void CContextView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_D
 {
        switch (id) {
        case EO_BASE:
-               if (!strcmp(ev->keyname, KEY_BACK) && !CViewMgr::GetInstance()->PopView()) {
-                       _ERR("Pop View failed.");
-                       CViewMgr::Finalize();
+               if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE)) {
+                       if (!CViewMgr::GetInstance()->PopView()) {
+                               _ERR("Pop View failed.");
+                               CViewMgr::Finalize();
+                       }
                }
                break;
 
@@ -269,14 +270,14 @@ void CContextView::OnKeyDown(int id, Evas *e, Evas_Object *obj, Evas_Event_Key_D
                break;
 
        case EO_CTGR_BTN:
-               if (!strcmp(ev->keyname, KEY_BACK))
+               if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        m_DestroyCtxpopup();
                else if (!strcmp(ev->keyname, KEY_ENTER))
                        m_CategoryItemSelected(obj);
                break;
 
        case EO_DEL_POPUP:
-               if (!strcmp(ev->keyname, KEY_BACK))
+               if (!strcmp(ev->keyname, KEY_BACK) || !strcmp(ev->keyname, KEY_BACK_REMOTE))
                        evas_object_del(m->popup);
                break;
 
@@ -492,13 +493,6 @@ bool CContextView::m_MakeCategoryItems(Evas_Object *item, int idx)
        return true;
 }
 
-void CContextView::sm_CbCtgrBtnBack(void *data, Evas_Object *obj, void *ev)
-{
-       CContextView *This = (CContextView *)data;
-
-       This->m_DestroyCtxpopup();
-}
-
 /**
  * @Called when the category menu button is selected.
  *
@@ -557,9 +551,6 @@ void CContextView::m_CategorySelected(Evas_Object *obj)
                Connect(item, EO_CTGR_BTN, TYPE_MOUSE_MOVE | TYPE_KEY_DOWN
                                | TYPE_FOCUSED | TYPE_UNFOCUSED | TYPE_CLICKED);
 
-               eext_object_event_callback_add(item, EEXT_CALLBACK_BACK,
-                               sm_CbCtgrBtnBack, this);
-
                elm_box_pack_end(box, item);
        }
 
@@ -584,11 +575,6 @@ err:
        return;
 }
 
-void CContextView::sm_CbPopupBack(void *data, Evas_Object *obj, void *ev)
-{
-       evas_object_del(obj);
-}
-
 /**
  * @Called when the delete menu button is selected.
  *
@@ -616,7 +602,6 @@ void CContextView::m_DeleteSelected(Evas_Object *obj)
        evas_object_show(popup);
        m->popup = popup;
        Connect(popup, EO_DEL_POPUP, TYPE_KEY_DOWN);
-       eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, sm_CbPopupBack, NULL);
 
        lbl = elm_label_add(popup);
        if (!lbl)
@@ -1088,14 +1073,6 @@ bool CContextView::m_DrawFullView(void)
        return true;
 }
 
-void CContextView::sm_CbBaseBack(void *data, Evas_Object *obj, void *ev)
-{
-       if (!CViewMgr::GetInstance()->PopView()) {
-               _ERR("Pop View failed.");
-               CViewMgr::Finalize();
-       }
-}
-
 /**
  * @Initializes the base layout for contextual menu view.
  *
@@ -1201,8 +1178,6 @@ bool CContextView::Create(void *data)
 
        _SET_PRIV(m->base, m);
 
-       eext_object_event_callback_add(m->base, EEXT_CALLBACK_BACK, sm_CbBaseBack, NULL);
-
        CBaseView::Create(NULL);
 
        return true;