Rework to use launcher wrapper from libqtappfw

Switch to using the new app launcher API wrapper from libqtappfw in
order to migrate to the new gRPC based API implementation.  As well,
the copyright headers in the source files have been tweaked to remove
the Apache license boilerplate in favour of a SPDX license tag.

Bug-AGL: SPEC-4559

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I62cd0a51e9c97b1db3d86ca67b7c92d086d2f1c9

1 files changed, 5 insertions, 18 deletions

diff --git a/launcher/qml/Launcher.qml b/launcher/qml/Launcher.qml
index 894ff98..3aef4e6 100644
--- a/launcher/qml/Launcher.qml
+++ b/launcher/qml/Launcher.qml
@@ -67,7 +67,7 @@ ApplicationWindow {
             // uncomment this out if you want to highlight the currently selected item
             //highlight: Rectangle { width: 80; height: 80; color: "steelblue"; opacity: 0.3 }
 
-            model: ApplicationModel { id: applicationModel }
+            model: ApplicationModel
             delegate: Item {
                 width: grid.cellWidth
                 height: grid.cellHeight
@@ -131,26 +131,13 @@ ApplicationWindow {
                     property string currentApp: ''
                     onClicked: {
                         parent.GridView.view.currentIndex = index
-                        currentApp = applicationModel.appid(parent.GridView.view.currentIndex)
-                        homescreenHandler.tapShortcut(currentApp)
+                        currentApp = ApplicationModel.appid(parent.GridView.view.currentIndex)
+                        console.debug("Launcher: Starting app " + currentApp)
+                        applauncher.startApplication(currentApp)
+                        console.debug("Launcher: Started app " + currentApp)
                     }
                 }
             }
-
-            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);
-                }
-            }
         }
     }
 }