Add Nav and Media app to control bar.

[staging/HomeScreen.git] / HomeScreen / src / homescreencontrolinterface.cpp

diff --git a/HomeScreen/src/homescreencontrolinterface.cpp b/HomeScreen/src/homescreencontrolinterface.cpp
index bc66e53..0c35b1c 100644 (file)
--- a/HomeScreen/src/homescreencontrolinterface.cpp
+++ b/HomeScreen/src/homescreencontrolinterface.cpp
@@ -24,10 +24,16 @@ HomeScreenControlInterface::~HomeScreenControlInterface()
     delete mp_homeScreenAdaptor;
 }
 
-QRect HomeScreenControlInterface::getLayoutRenderAreaForSurfaceId(int surfaceId)
+QList<int> HomeScreenControlInterface::getAllSurfacesOfProcess(int pid)
 {
-    qDebug("getLayoutRenderAreaForSurfaceId %d", surfaceId);
-    return newRequestGetLayoutRenderAreaForSurfaceId(surfaceId);
+    qDebug("getAllSurfacesOfProcess %d", pid);
+    return newRequestGetAllSurfacesOfProcess(pid);
+}
+
+int HomeScreenControlInterface::getSurfaceStatus(int surfaceId)
+{
+    qDebug("getSurfaceStatus %d", surfaceId);
+    return newRequestGetSurfaceStatus(surfaceId);
 }
 
 void HomeScreenControlInterface::hardKeyPressed(int key)
@@ -38,7 +44,13 @@ void HomeScreenControlInterface::hardKeyPressed(int key)
     {
     case InputEvent::HARDKEY_NAV:
         qDebug("hardKeyPressed NAV key pressed!");
-        pid = mp_dBusAppFrameworkProxy->launchApp("demoapp");
+        pid = mp_dBusAppFrameworkProxy->launchApp("nav@0.1");
+        qDebug("pid: %d", pid);
+        newRequestsToBeVisibleApp(pid);
+        break;
+    case InputEvent::HARDKEY_MEDIA:
+        qDebug("hardKeyPressed MEDIA key pressed!");
+        pid = mp_dBusAppFrameworkProxy->launchApp("media@0.1");
         qDebug("pid: %d", pid);
         newRequestsToBeVisibleApp(pid);
         break;
@@ -48,10 +60,16 @@ void HomeScreenControlInterface::hardKeyPressed(int key)
     }
 }
 
-void HomeScreenControlInterface::renderSurfaceToArea(int surfaceId, const QRect &renderArea)
+void HomeScreenControlInterface::renderSurfaceToArea(int surfaceId, int layoutArea)
 {
-    qDebug("requestSurfaceIdToFullScreen %d", surfaceId);
-    newRequestRenderSurfaceToArea(surfaceId, renderArea);
+    qDebug("renderSurfaceToArea %d %d", surfaceId, layoutArea);
+    newRequestRenderSurfaceToArea(surfaceId, layoutArea);
+}
+
+bool HomeScreenControlInterface::renderSurfaceToAreaAllowed(int surfaceId, int layoutArea)
+{
+    qDebug("renderSurfaceToAreaAllowed %d %d", surfaceId, layoutArea);
+    return renderSurfaceToAreaAllowed(surfaceId, layoutArea);
 }
 
 void HomeScreenControlInterface::requestSurfaceIdToFullScreen(int surfaceId)