diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-08-01 11:24:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-08-01 11:24:08 +0000 |
| commit | 761c15a8ab0c0b390e1cff84ad5d33d48b99ed98 (patch) | |
| tree | aa7d7d8605a6e3e7e9e0e27d54d6c58261b7cb50 /homescreen/src/statusbarmodel.cpp | |
| parent | 220d40ffb6339edd3bb14d29d32cabfa44293fc9 (diff) | |
| parent | 564c3c80884c0e9064a19e31655fd80f92eb594a (diff) | |
Merge "Change bluetooth status using agl-service-bluetooth"
Diffstat (limited to 'homescreen/src/statusbarmodel.cpp')
| -rw-r--r-- | homescreen/src/statusbarmodel.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/homescreen/src/statusbarmodel.cpp b/homescreen/src/statusbarmodel.cpp index 19767a9..5e63b7d 100644 --- a/homescreen/src/statusbarmodel.cpp +++ b/homescreen/src/statusbarmodel.cpp @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 The Qt Company Ltd. + * Copyright (C) 2017, 2018 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. @@ -110,7 +111,8 @@ int StatusBarModel::rowCount(const QModelIndex &parent) const if (parent.isValid()) return 0; - return StatusBarServer::SupportedCount; + // Delete bluetooth because use agl-service-bluetooth. + return StatusBarServer::SupportedCount - 1; } QVariant StatusBarModel::data(const QModelIndex &index, int role) const @@ -121,7 +123,11 @@ QVariant StatusBarModel::data(const QModelIndex &index, int role) const switch (role) { case Qt::DisplayRole: - ret = d->iconList[index.row()]; + if (index.row() == 0){ + ret = d->iconList[StatusBarServer::StatusWifi]; + }else if (index.row() == 1){ + ret = d->iconList[StatusBarServer::StatusCellular]; + } break; default: break; |