diff options
author | Scott Murray <scott.murray@konsulko.com> | 2022-09-10 12:59:02 -0400 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-09-16 14:19:01 +0000 |
commit | 20f629dd6d8628611d950073c4f7a0446c40365a (patch) | |
tree | f5918ebce7ec2cbcaad8588290ae55e7c3fea3ae /homescreen/src/homescreenhandler.h | |
parent | d1347bf236f84908fea96ba929e0e8376c2b1d78 (diff) |
Rework to use launcher wrapper from libqtappfw
Changes:
- Switch to using the new app launcher API wrapper from libqtappfw
in order to migrate to the new gRPC based API implementation.
- The appStarted and appTerminated methods in HomescreenHandler have
been renamed to activateApp and deactivateApp, respectively, to
better reflect what they do. A new processAppStatusEvent method
had been added that calls them as appropriate based on the event
from the AppLauncherClient status update signal.
- The copyright headers in the source files have been tweaked to
remove the Apache license boilerplate in favour of a SPDX license
tag.
- The code in main.cpp that was not formatted with Linux-style has
been reformatted to match the rest of the file.
Bug-AGL: SPEC-4559
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I236cb6a412945a6df7d35652c55f664264964f9c
Diffstat (limited to 'homescreen/src/homescreenhandler.h')
-rw-r--r-- | homescreen/src/homescreenhandler.h | 59 |
1 files changed, 20 insertions, 39 deletions
diff --git a/homescreen/src/homescreenhandler.h b/homescreen/src/homescreenhandler.h index 503221a..a2baeb2 100644 --- a/homescreen/src/homescreenhandler.h +++ b/homescreen/src/homescreenhandler.h @@ -1,68 +1,49 @@ +// SPDX-License-Identifier: Apache-2.0 /* * 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Copyright (c) 2022 Konsulko Group */ #ifndef HOMESCREENHANDLER_H #define HOMESCREENHANDLER_H #include <QObject> +#include <string> #include "applicationlauncher.h" -#include "applaunch_interface.h" +#include "AppLauncherClient.h" #include "shell.h" -#include <string> using namespace std; class HomescreenHandler : public QObject { - Q_OBJECT + Q_OBJECT public: - explicit HomescreenHandler(Shell *aglShell, ApplicationLauncher *launcher = 0, QObject *parent = 0); - ~HomescreenHandler(); - - void init(void); + explicit HomescreenHandler(Shell *aglShell, ApplicationLauncher *launcher = 0, QObject *parent = 0); + ~HomescreenHandler(); - Q_INVOKABLE void tapShortcut(QString application_id); + Q_INVOKABLE void tapShortcut(QString application_id); -#if 0 - void onRep(struct json_object* reply_contents); - void onEv(const string& event, struct json_object* event_contents); -#endif - static void* myThis; -#if 0 - static void onRep_static(struct json_object* reply_contents); - static void onEv_static(const string& event, struct json_object* event_contents); -#endif - - void addAppToStack(const QString& application_id); + void addAppToStack(const QString& application_id); + void activateApp(const QString& app_id); + void deactivateApp(const QString& app_id); signals: - void showNotification(QString application_id, QString icon_path, QString text); - void showInformation(QString info); + void showNotification(QString application_id, QString icon_path, QString text); + void showInformation(QString info); public slots: - void appStarted(const QString& application_id); - void appTerminated(const QString& application_id); + void processAppStatusEvent(const QString &id, const QString &status); private: - ApplicationLauncher *mp_launcher; - Shell *aglShell; - org::automotivelinux::AppLaunch *applaunch_iface; - QStringList apps_stack; + ApplicationLauncher *mp_launcher; + AppLauncherClient *mp_applauncher_client; + + Shell *aglShell; + + QStringList apps_stack; }; #endif // HOMESCREENHANDLER_H |