X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fqml%2FShortcutArea.qml;h=a8ce1279cceceae761d2c382738964f83580bbb9;hb=b57a3197dad42bdd7a72266aaa160341573b0627;hp=14c7b6be9508e7fe2dc0bc078adea525c23d1c1d;hpb=0592a405aa68f3baf6773795efa5522e4ee16779;p=apps%2Fhomescreen.git

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index 14c7b6b..a8ce127 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
+ * Copyright (c) 2017, 2018, 2019 TOYOTA MOTOR CORPORATION
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,18 +28,22 @@ Item {
     ListModel {
         id: applicationModel
         ListElement {
-            name: 'Home'
-            application: ''
+            appid: 'launcher'
+            name: 'launcher'
+            application: 'launcher@0.1'
         }
         ListElement {
-            name: 'Multimedia'
+            appid: 'mediaplayer'
+            name: 'MediaPlayer'
             application: 'mediaplayer@0.1'
         }
         ListElement {
+            appid: 'hvac'
             name: 'HVAC'
             application: 'hvac@0.1'
         }
         ListElement {
+            appid: 'navigation'
             name: 'Navigation'
             application: 'navigation@0.1'
         }
@@ -55,26 +60,9 @@ Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 name: model.name
-                active: model.application === launcher.current
+                active: model.name === launcher.current
                 onClicked: {
-                    if (0 === model.index) {
-                        appLauncherAreaLauncher.visible = true
-                        applicationArea.visible = false
-                        layoutHandler.hideAppLayer()
-                        launcher.current = ''
-                    }
-                    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!")
-                        }
-                    }
+                    homescreenHandler.tapShortcut(model.appid)
                 }
             }
         }