From: Matt Porter Date: Wed, 28 Dec 2016 13:55:12 +0000 (-0500) Subject: Replace connectivity with mixer support X-Git-Tag: 3.0.0~1 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=staging%2FHomeScreen.git;a=commitdiff_plain;h=ebaaeae491e9e033faf5850192ea660fc83f087a Replace connectivity with mixer support There is no top-level connectivity app. All connectivity management requirements are implemented as a part of settings. Replace the connectivity icon/launcher with the mixer icon/launcher and add the mixer artwork. Change-Id: I6126de401ce7e0ced52e4a9265b59d14fc9cc855 Signed-off-by: Matt Porter --- diff --git a/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png b/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png new file mode 100644 index 0000000..502c758 Binary files /dev/null and b/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Active-01.png differ diff --git a/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png b/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png new file mode 100644 index 0000000..e2e7e3d Binary files /dev/null and b/HomeScreen/qml/images/Home/HMI_AppLauncher_Mixer_Inactive-01.png differ diff --git a/HomeScreen/qml/images/Home/home.qrc b/HomeScreen/qml/images/Home/home.qrc index 7dde212..e73633e 100644 --- a/HomeScreen/qml/images/Home/home.qrc +++ b/HomeScreen/qml/images/Home/home.qrc @@ -7,6 +7,8 @@ HMI_AppLauncher_Dashboard_Inactive-01.png HMI_AppLauncher_HVAC_Active-01.png HMI_AppLauncher_HVAC_Inactive-01.png + HMI_AppLauncher_Mixer_Active-01.png + HMI_AppLauncher_Mixer_Inactive-01.png HMI_AppLauncher_Multimedia_Active-01.png HMI_AppLauncher_Multimedia_Inactive-01.png HMI_AppLauncher_Navigation_Active-01.png diff --git a/HomeScreen/src/applicationmodel.cpp b/HomeScreen/src/applicationmodel.cpp index 2a16ace..2b56959 100644 --- a/HomeScreen/src/applicationmodel.cpp +++ b/HomeScreen/src/applicationmodel.cpp @@ -46,7 +46,7 @@ ApplicationModel::Private::Private(ApplicationModel *parent) data.append(AppInfo(QStringLiteral("Phone"), QStringLiteral("PHONE"), QStringLiteral("phone@0.1"))); data.append(AppInfo(QStringLiteral("Radio"), QStringLiteral("RADIO"), QStringLiteral("radio@0.1"))); data.append(AppInfo(QStringLiteral("Multimedia"), QStringLiteral("MULTIMEDIA"), QStringLiteral("mediaplayer@0.1"))); - data.append(AppInfo(QStringLiteral("Connectivity"), QStringLiteral("CONNECTIVITY"), QStringLiteral("connectivity@0.1"))); + data.append(AppInfo(QStringLiteral("Mixer"), QStringLiteral("MIXER"), QStringLiteral("mixer@0.1"))); data.append(AppInfo(QStringLiteral("Dashboard"), QStringLiteral("DASHBOARD"), QStringLiteral("dashboard@0.1"))); data.append(AppInfo(QStringLiteral("Settings"), QStringLiteral("SETTINGS"), QStringLiteral("settings@0.1"))); data.append(AppInfo(QStringLiteral("POI"), QStringLiteral("POINT OF\nINTEREST"), QStringLiteral("poi@0.1")));