Copy source code from homescreen-2017flounder_5.99.2flounder/5.99.25.99.2

    We decide to use homescreen instead of homescreen-2017.
    Copy the source code from homescreen-2017 and delete word "-2017".
    Revision: b4db06287bc997ded71deab50ff0ff5889b09e1f

Bug-AGL: SPEC-1549

Change-Id: Id77226b7ce35bbc29c868281c37b76ea3f930ad5
Signed-off-by: zheng_wenlong <wenlong_zheng@nexty-ele.com>

1 files changed, 11 insertions, 19 deletions

diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index 9be3fd0..e0c9182 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 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,11 +28,11 @@ Item {
     ListModel {
         id: applicationModel
         ListElement {
-            name: 'Home'
-            application: ''
+            name: 'launcher'
+            application: 'launcher@0.1'
         }
         ListElement {
-            name: 'Multimedia'
+            name: 'MediaPlayer'
             application: 'mediaplayer@0.1'
         }
         ListElement {
@@ -55,26 +56,17 @@ 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 = ''
+                    pid = launcher.launch(model.application)
+                    if (1 < pid) {
+                        applicationArea.visible = true
                     }
                     else {
-                        pid = launcher.launch(model.application)
-                        if (1 < pid) {
-                            applicationArea.visible = true
-                            appLauncherAreaLauncher.visible = false
-                            layoutHandler.makeMeVisible(pid)
-                            layoutHandler.showAppLayer(model.application, pid)
-                        }
-                        else {
-                            console.warn("app cannot be launched!")
-                        }
+                        console.warn(model.application)
+                        console.warn("app cannot be launched!")
                     }
+                    homescreenHandler.tapShortcut(model.name)
                 }
             }
         }