X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreen%2Fqml%2FShortcutArea.qml;h=aeaf097ab3a78e9b33cf260353e8f85c2c4b1bf6;hb=57e18aeaf2a9ae292af7559580f8154527fc04f5;hp=9ef870128f8627471966d05de5029316a1fa2fbe;hpb=67e88567cb97213348031728d59652b7c10d0e19;p=staging%2FHomeScreen.git

diff --git a/HomeScreen/qml/ShortcutArea.qml b/HomeScreen/qml/ShortcutArea.qml
index 9ef8701..aeaf097 100644
--- a/HomeScreen/qml/ShortcutArea.qml
+++ b/HomeScreen/qml/ShortcutArea.qml
@@ -17,20 +17,12 @@
 
 import QtQuick 2.2
 import QtQuick.Layouts 1.1
-import HomeScreen 1.0
 
 Item {
     id: root
     width: 785
     height: 218
 
-    ApplicationLauncher {
-        id: launcher
-    }
-
-    LayoutHandler {
-        id: layoutHandler
-    }
 
     ListModel {
         id: applicationModel
@@ -40,7 +32,7 @@ Item {
         }
         ListElement {
             name: 'Multimedia'
-            application: 'radio@0.1'
+            application: 'mediaplayer@0.1'
         }
         ListElement {
             name: 'HVAC'
@@ -67,8 +59,23 @@ Item {
                 active: model.index === root.currentIndex
                 onClicked: {
                     root.currentIndex = active ? -1 : model.index
-                    pid = launcher.launch(model.application)
-                    layoutHandler.makeMeVisible(pid)
+                    if (0 === model.index) {
+                        appLauncherAreaLauncher.visible = true
+                        applicationArea.visible = false
+                        layoutHandler.hideAppLayer()
+                    }
+                    else {
+                        pid = launcher.launch(model.application)
+                        if (1 < pid) {
+                            applicationArea.visible = true
+                            appLauncherAreaLauncher.visible = false
+                            layoutHandler.makeMeVisible(pid)
+                            layoutHandler.showAppLayer(pid)
+                        }
+                        else {
+                            console.warn("app cannot be launched!")
+                        }
+                    }
                 }
             }
         }