From 5462c15547825c18139c69dc0b10b02d04bf9f10 Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Wed, 27 Mar 2019 16:36:08 +0000
Subject: Revert "Start app and get runnables list by homescreen"

https://gerrit.automotivelinux.org/gerrit/#/c/20559/
and
https://gerrit.automotivelinux.org/gerrit/#/c/20223/

caused the launcher not to display any icons.

Reverting until resolved.

This reverts commit 607fdc0374e76a272455cc010f35693ba8b6894b.

Change-Id: I3040f0a44b8cfc449e57c27e32ed631fc98b34fd
---
 launcher/qml/Launcher.qml | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'launcher/qml')

diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml
index 2247f51..1ddfc4b 100644
--- a/launcher/qml/Launcher.qml
+++ b/launcher/qml/Launcher.qml
@@ -1,7 +1,7 @@
 /*
  * Copyright (C) 2016 The Qt Company Ltd.
  * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2018,2019 TOYOTA MOTOR CORPORATION
+ * Copyright (c) 2018 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.
@@ -59,21 +59,6 @@ ApplicationWindow {
             height: grid.cellHeight
         }
 
-        Connections {
-            target: homescreenHandler
-            onAppListUpdate: {
-                console.warn("applist update in Launcher.qml")
-                applicationModel.updateApplist(info);
-            }
-        }
-        Connections {
-            target: homescreenHandler
-            onInitAppList: {
-                console.warn("applist init in Launcher.qml")
-                applicationModel.initAppList(data);
-            }
-        }
-
         MouseArea {
             id: loc
             anchors.fill: parent
@@ -88,7 +73,13 @@ ApplicationWindow {
                     return
                 }
                 if (currentId === '') {
-                    homescreenHandler.tapShortcut(applicationModel.appid(loc.index))
+                    pid = launcher.launch(applicationModel.id(loc.index))
+                    if (1 < pid) {
+                        homescreenHandler.tapShortcut(applicationModel.appid(loc.index))
+                    }
+                    else {
+                        console.warn("app cannot be launched!")
+                    }
                 } else {
                     currentId = ''
                 }
-- 
cgit 1.2.3-korg