summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2018-11-14 13:50:56 +0800
committerwang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>2018-11-14 15:48:55 +0800
commitf0432213c7c40d70fef06f9ceb665463d23b32e6 (patch)
treef668442e7237f446bdc7e268f2877af1c05a7018
parent3227f2bf56642ea0b5495a461353b2f195112a51 (diff)
use appid instead of appname in "tap_shortcut"guppy_6.99.2guppy_6.99.1guppy/6.99.2guppy/6.99.16.99.26.99.1
Now In homescreen-service used application_id to identify different application, so use appid instead of appname in "tap_shortcut" parameter. Bug-AGL: SPEC-1764 Change-Id: Ib4bc46248ca6abbdf9dd787f1cac9965df4c0c35 Signed-off-by: wang_zhiqiang <wang_zhiqiang@dl.cn.nexty-ele.com>
-rw-r--r--.gitreview2
-rw-r--r--src/runxdg.cpp46
2 files changed, 8 insertions, 40 deletions
diff --git a/.gitreview b/.gitreview
index 6f40ba2..39ab647 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
[gerrit]
host=gerrit.automotivelinux.org
port=29418
-project=staging/soundmanager
+project=staging/xdg-launcher
defaultbranch=master
diff --git a/src/runxdg.cpp b/src/runxdg.cpp
index 3ff942c..1b9c08c 100644
--- a/src/runxdg.cpp
+++ b/src/runxdg.cpp
@@ -35,6 +35,7 @@
#include "runxdg.hpp"
#define RUNXDG_CONFIG "runxdg.toml"
+#define AREA_NORMAL_FULL "normal.full"
void fatal(const char* format, ...)
{
@@ -298,10 +299,7 @@ int RunXDG::init_wm (void)
std::function< void(json_object*) > h_syncdraw =
[this](json_object* object) {
AGL_DEBUG("Got Event_SyncDraw");
- json_object* obj = json_object_new_object();
- json_object_object_add(obj, this->m_wm->kKeyDrawingName,
- json_object_new_string(this->m_role.c_str()));
- this->m_wm->endDraw(obj);
+ this->m_wm->endDraw(this->m_role.c_str());
};
std::function< void(json_object*) > h_flushdraw= [](json_object* object) {
@@ -327,26 +325,8 @@ int RunXDG::init_hs (void)
}
std::function< void(json_object*) > handler = [this] (json_object* object) {
- json_object *val;
-
- if (json_object_object_get_ex(object, "application_name", &val)) {
- const char *name = json_object_get_string(val);
-
- AGL_DEBUG("Event_TapShortcut <%s>", name);
-
- if (strcmp(name, this->m_role.c_str()) == 0) {
- // check app exist and re-launch if needed
- AGL_DEBUG("Activesurface %s ", this->m_role.c_str());
-
- json_object *obj = json_object_new_object();
- json_object_object_add(obj, this->m_wm->kKeyDrawingName,
- json_object_new_string(this->m_role.c_str()));
- json_object_object_add(obj, this->m_wm->kKeyDrawingArea,
- json_object_new_string("normal.full"));
-
- this->m_wm->activateSurface(obj);
- }
- }
+ AGL_DEBUG("Activesurface %s ", this->m_role.c_str());
+ this->m_wm->activateWindow(this->m_role.c_str(), AREA_NORMAL_FULL);
};
m_hs->set_event_handler(LibHomeScreen::Event_TapShortcut, handler);
@@ -476,26 +456,14 @@ void RunXDG::setup_surface (int id)
std::string sid = std::to_string(id);
// This surface is mine, register pair app_name and ivi id.
- json_object *obj = json_object_new_object();
- json_object_object_add(obj, m_wm->kKeyDrawingName,
- json_object_new_string(m_role.c_str()));
- json_object_object_add(obj, m_wm->kKeyIviId,
- json_object_new_string(sid.c_str()));
-
- AGL_DEBUG("requestSurfaceXDG(%s,%s)", m_role.c_str(), sid.c_str());
- m_wm->requestSurfaceXDG(obj);
+ AGL_DEBUG("requestSurfaceXDG(%s,%d)", m_role.c_str(), id);
+ m_wm->requestSurfaceXDG(this->m_role.c_str(), id);
if (m_pending_create) {
// Recovering 1st time tap_shortcut is dropped because
// the application has not been run yet (1st time launch)
m_pending_create = false;
-
- json_object *obj = json_object_new_object();
- json_object_object_add(obj, m_wm->kKeyDrawingName,
- json_object_new_string(m_role.c_str()));
- json_object_object_add(obj, m_wm->kKeyDrawingArea,
- json_object_new_string("normal.full"));
- m_wm->activateSurface(obj);
+ m_wm->activateWindow(this->m_role.c_str(), AREA_NORMAL_FULL);
}
}