summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2019-02-20 14:09:01 +0800
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-03-15 15:08:27 +0000
commit3a75b90a396589b3a2f1f971424fdd64d53106e0 (patch)
treec69febf20306c2d29efc4ac6ee37362590252048
parentbde8622fc349829cf03e196f2161995688fc1a09 (diff)
Start app and get runnables list by homescreen
1.only call showWindow when start application. 2.change area from "normal" to "normal.full". Bug-AGL: SPEC-2188 Change-Id: I0f3a72d996e73e3ef85eb19fdf130f46757683d6 Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
-rw-r--r--homescreen/qml/ShortcutArea.qml10
-rw-r--r--homescreen/src/homescreenhandler.cpp4
2 files changed, 3 insertions, 11 deletions
diff --git a/homescreen/qml/ShortcutArea.qml b/homescreen/qml/ShortcutArea.qml
index d7e97f0..a8ce127 100644
--- a/homescreen/qml/ShortcutArea.qml
+++ b/homescreen/qml/ShortcutArea.qml
@@ -1,7 +1,7 @@
/*
* Copyright (C) 2016 The Qt Company Ltd.
* Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * 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.
@@ -62,14 +62,6 @@ Item {
name: model.name
active: model.name === launcher.current
onClicked: {
- pid = launcher.launch(model.application)
- if (1 < pid) {
- applicationArea.visible = true
- }
- else {
- console.warn(model.application)
- console.warn("app cannot be launched!")
- }
homescreenHandler.tapShortcut(model.appid)
}
}
diff --git a/homescreen/src/homescreenhandler.cpp b/homescreen/src/homescreenhandler.cpp
index d3338be..4db60fb 100644
--- a/homescreen/src/homescreenhandler.cpp
+++ b/homescreen/src/homescreenhandler.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 TOYOTA MOTOR CORPORATION
+ * 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.
@@ -84,7 +84,7 @@ void HomescreenHandler::tapShortcut(QString application_id)
HMI_DEBUG("HomeScreen","tapShortcut %s", application_id.toStdString().c_str());
struct json_object* j_json = json_object_new_object();
struct json_object* value;
- value = json_object_new_string("normal");
+ value = json_object_new_string("normal.full");
json_object_object_add(j_json, "area", value);
mp_hs->showWindow(application_id.toStdString().c_str(), j_json);