Merge lp:~lukas-kde/unity8/appdrawer-search-more into lp:unity8

[Lukáš Tinkl]

Appdrawer: search in more fields (appid and description), optimize and massively speed up

Prereq-archive: ppa:ci-train-ppa-service/2701

Appdrawer: search in more fields (appid and description), optimize and massively speed up

As I added more field to search in, it slowed down a bit. So I optimized the tiny bits throughout the AppDrawerProxyModel but the biggest bottleneck turned out to be the toplevel dynamicSortFilter in Drawer.qml

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, https://code.launchpad.net/~lukas-kde/unity-api/launcheritem-description/+merge/321924 and https://code.launchpad.net/~mzanetti/unity8/appdrawer-recent-apps/+merge/319697

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * If you changed the UI, has there been a design review?

N/A

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2916
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3678/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4879/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4907
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4718/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4718/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3678/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

I guess the startsWith -> contains change is the most "controversial" change here.

Maybe contains should be only for description? What do others think?

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2918
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3693/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4906/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4934
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4742/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4742/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3693/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/appdrawer-search-more]

2919. By Lukáš Tinkl on 2017-04-06

restore sortRole

[Albert Astals Cid (aacid)]

> I guess the startsWith -> contains change is the most "controversial" change here.
>
> Maybe contains should be only for description? What do others think?

Given yesterday's news i guess it doesn't make sense to nitpick much over this.

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass? If not, please explain why.
Waiting

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2918
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3698/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4915/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4943
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4751/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4751/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3698/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2919
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3699/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4916/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4944
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4752/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4752/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3699/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/appdrawer-search-more]

2920. By Lukáš Tinkl on 2017-04-06

merge parent

2921. By Lukáš Tinkl on 2017-04-06

fix segfaulting test (add the missing description field)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2921
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3700/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4918/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4946
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4754/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4754/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3700/rebuild

review: Needs Fixing (continuous-integration)

[lp:~lukas-kde/unity8/appdrawer-search-more]

2922. By Lukáš Tinkl on 2017-04-06

don't crash

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3702/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3702/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3703/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4921/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4949
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4757/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4757/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4757
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4757/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4757/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3703/rebuild

review: Needs Fixing (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

^^ now it fails to build on zesty because of ual not being up to date (wrt xenial)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2922
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3704/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4922/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4950
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4758/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4758/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4758/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4758
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4758/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3704/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2922. By Lukáš Tinkl on 2017-04-06

don't crash

2921. By Lukáš Tinkl on 2017-04-06

fix segfaulting test (add the missing description field)

2920. By Lukáš Tinkl on 2017-04-06

merge parent

2919. By Lukáš Tinkl on 2017-04-06

restore sortRole

2918. By Lukáš Tinkl on 2017-04-05

merge lp:~mzanetti/unity8/appdrawer-recent-apps

2917. By Lukáš Tinkl on 2017-04-04

invalidate and sort only after the source model had been set

2916. By Lukáš Tinkl on 2017-04-04

massive speedup by not using dynamicFilter \o/

2915. By Lukáš Tinkl on 2017-04-04

optimize the filterString search

2914. By Lukáš Tinkl on 2017-04-04

perform the search in appName and Description too

=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
--- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2017-04-06 13:50:59 +0000
+++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2017-04-06 13:50:59 +0000
@@ -89,6 +89,19 @@
     }
 }
 
+QString LauncherItem::description() const
+{
+    return m_description;
+}
+
+void LauncherItem::setDescription(const QString &description)
+{
+    if (m_description != description) {
+        m_description = description;
+        Q_EMIT descriptionChanged(m_description);
+    }
+}
+
 uint LauncherItem::popularity() const
 {
     // Not exposing usage order in greeter session at this point.

=== modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
--- plugins/Greeter/Unity/Launcher/launcheritem.h	2017-04-06 13:50:59 +0000
+++ plugins/Greeter/Unity/Launcher/launcheritem.h	2017-04-06 13:50:59 +0000
@@ -35,6 +35,7 @@
     QString name() const override;
     QString icon() const override;
     QStringList keywords() const override;
+    QString description() const override;
     uint popularity() const override;
     bool pinned() const override;
     bool running() const override;
@@ -52,6 +53,7 @@
     void setName(const QString &name);
     void setIcon(const QString &icon);
     void setKeywords(const QStringList &keywords);
+    void setDescription(const QString &description);
     void setPinned(bool pinned);
     void setRunning(bool running);
     void setRecent(bool recent);
@@ -67,6 +69,7 @@
     QString m_name;
     QString m_icon;
     QStringList m_keywords;
+    QString m_description;
     bool m_pinned;
     bool m_running;
     bool m_recent;

=== modified file 'plugins/Unity/Launcher/appdrawermodel.cpp'
--- plugins/Unity/Launcher/appdrawermodel.cpp	2017-04-06 13:50:59 +0000
+++ plugins/Unity/Launcher/appdrawermodel.cpp	2017-04-06 13:50:59 +0000
@@ -32,6 +32,7 @@
         }
         LauncherItem* item = new LauncherItem(appId, info.name, info.icon, this);
         item->setKeywords(info.keywords);
+        item->setDescription(info.description);
         item->setPopularity(info.popularity);
         m_list.append(item);
     }
@@ -59,6 +60,8 @@
         return m_list.at(index.row())->icon();
     case RoleKeywords:
         return m_list.at(index.row())->keywords();
+    case RoleDescription:
+        return m_list.at(index.row())->description();
     case RoleUsage:
         return m_list.at(index.row())->popularity();
     }

=== modified file 'plugins/Unity/Launcher/launcheritem.cpp'
--- plugins/Unity/Launcher/launcheritem.cpp	2017-04-06 13:50:59 +0000
+++ plugins/Unity/Launcher/launcheritem.cpp	2017-04-06 13:50:59 +0000
@@ -104,6 +104,19 @@
     }
 }
 
+QString LauncherItem::description() const
+{
+    return m_description;
+}
+
+void LauncherItem::setDescription(const QString &description)
+{
+    if (m_description != description) {
+        m_description = description;
+        Q_EMIT descriptionChanged(m_description);
+    }
+}
+
 bool LauncherItem::pinned() const
 {
     return m_pinned;

=== modified file 'plugins/Unity/Launcher/launcheritem.h'
--- plugins/Unity/Launcher/launcheritem.h	2017-04-06 13:50:59 +0000
+++ plugins/Unity/Launcher/launcheritem.h	2017-04-06 13:50:59 +0000
@@ -39,6 +39,7 @@
     QString name() const override;
     QString icon() const override;
     QStringList keywords() const override;
+    QString description() const override;
     uint popularity() const override;
     bool pinned() const override;
     bool running() const override;
@@ -56,6 +57,7 @@
     void setName(const QString &name);
     void setIcon(const QString &icon);
     void setKeywords(const QStringList &keywords);
+    void setDescription(const QString &description);
     void setPopularity(uint popularity);
     void setPinned(bool pinned);
     void setRunning(bool running);
@@ -72,6 +74,7 @@
     QString m_name;
     QString m_icon;
     QStringList m_keywords;
+    QString m_description;
     uint m_popularity;
     bool m_pinned;
     bool m_running;

=== modified file 'plugins/Unity/Launcher/ualwrapper.cpp'
--- plugins/Unity/Launcher/ualwrapper.cpp	2017-04-06 13:50:59 +0000
+++ plugins/Unity/Launcher/ualwrapper.cpp	2017-04-06 13:50:59 +0000
@@ -66,14 +66,16 @@
 
         std::shared_ptr<Application> ualApp;
         ualApp = Application::create(ualAppId, Registry::getDefault());
+        auto appInfo = ualApp->info();
 
         info.appId = appId;
-        info.name = QString::fromStdString(ualApp->info()->name());
-        info.icon = QString::fromStdString(ualApp->info()->iconPath());
-        for (const std::string &keyword : ualApp->info()->keywords().value()) {
+        info.name = QString::fromStdString(appInfo->name());
+        info.icon = QString::fromStdString(appInfo->iconPath());
+        info.description = QString::fromStdString(appInfo->description());
+        for (const std::string &keyword : appInfo->keywords().value()) {
             info.keywords << QString::fromStdString(keyword);
         }
-        info.popularity = ualApp->info()->popularity();
+        info.popularity = appInfo->popularity();
         info.valid = true;
     } catch (const std::runtime_error &e) {
         qWarning() << "ubuntu-app-launch threw an exception getting app info for appId:" << appId << ":" << e.what();

=== modified file 'plugins/Unity/Launcher/ualwrapper.h'
--- plugins/Unity/Launcher/ualwrapper.h	2017-04-06 13:50:59 +0000
+++ plugins/Unity/Launcher/ualwrapper.h	2017-04-06 13:50:59 +0000
@@ -25,6 +25,7 @@
         bool valid = false;
         QString name;
         QString icon;
+        QString description;
         QStringList keywords;
         uint popularity = 0;
     };

=== modified file 'plugins/Utils/appdrawerproxymodel.cpp'
--- plugins/Utils/appdrawerproxymodel.cpp	2017-01-25 17:44:54 +0000
+++ plugins/Utils/appdrawerproxymodel.cpp	2017-04-06 13:50:59 +0000
@@ -25,7 +25,6 @@
 {
     setSortRole(AppDrawerModelInterface::RoleName);
     setSortLocaleAware(true);
-    sort(0);
 
     connect(this, &QAbstractListModel::rowsInserted, this, &AppDrawerProxyModel::countChanged);
     connect(this, &QAbstractListModel::rowsRemoved, this, &AppDrawerProxyModel::countChanged);
@@ -45,6 +44,8 @@
         setSortRole(m_sortBy == SortByAToZ ? AppDrawerModelInterface::RoleName : AppDrawerModelInterface::RoleUsage);
         connect(m_source, &QAbstractItemModel::rowsRemoved, this, &AppDrawerProxyModel::invalidate);
         connect(m_source, &QAbstractItemModel::rowsInserted, this, &AppDrawerProxyModel::invalidate);
+        connect(m_source, &QAbstractItemModel::modelReset, this, &AppDrawerProxyModel::invalidate);
+        sort(0);
         Q_EMIT sourceChanged();
     }
 }
@@ -59,7 +60,7 @@
     if (m_group != group) {
         m_group = group;
         Q_EMIT groupChanged();
-        invalidateFilter();
+        invalidate();
     }
 }
 
@@ -73,7 +74,7 @@
     if (m_filterLetter != filterLetter) {
         m_filterLetter = filterLetter;
         Q_EMIT filterLetterChanged();
-        invalidateFilter();
+        invalidate();
     }
 }
 
@@ -87,7 +88,7 @@
     if (m_filterString != filterString) {
         m_filterString = filterString;
         Q_EMIT filterStringChanged();
-        invalidateFilter();
+        invalidate();
     }
 }
 
@@ -113,10 +114,10 @@
 
 QVariant AppDrawerProxyModel::data(const QModelIndex &index, int role) const
 {
-    QModelIndex idx = mapToSource(index);
+    const QModelIndex idx = mapToSource(index);
     if (role == Qt::UserRole) {
-        QString name = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
-        return name.length() > 0 ? QString(name.at(0)).toUpper() : QChar();
+        const QString name = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
+        return !name.isEmpty() ? name.at(0).toUpper() : QChar();
     }
     return m_source->data(idx, role);
 }
@@ -135,30 +136,34 @@
 {
     Q_UNUSED(source_parent)
 
+    const QModelIndex idx{m_source->index(source_row, 0)};
+
     if (m_group == GroupByAToZ && source_row > 0) {
-        QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
-        QChar currentLetter = currentName.length() > 0 ? currentName.at(0) : QChar();
-        QString previousName = m_source->data(m_source->index(source_row - 1,0 ), AppDrawerModelInterface::RoleName).toString();
-        QChar previousLetter = previousName.length() > 0 ? previousName.at(0) : QChar();
-        if (currentLetter.toLower() == previousLetter.toLower()) {
+        const QString currentName = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
+        const QChar currentLetter = !currentName.isEmpty() ? currentName.at(0).toLower() : QChar();
+        const QString previousName = m_source->data(m_source->index(source_row - 1, 0), AppDrawerModelInterface::RoleName).toString();
+        const QChar previousLetter = !previousName.isEmpty() ? previousName.at(0).toLower() : QChar();
+        if (currentLetter == previousLetter) {
             return false;
         }
-    } else if(m_group == GroupByAll && source_row > 0) {
+    } else if (m_group == GroupByAll && source_row > 0) {
         return false;
     }
+
     if (!m_filterLetter.isEmpty()) {
-        QString currentName = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString();
-        QString currentLetter = currentName.length() > 0 ? QString(currentName.at(0)) : QString();
+        const QString currentName = m_source->data(idx, AppDrawerModelInterface::RoleName).toString();
+        const QString currentLetter = !currentName.isEmpty() ? QString(currentName.at(0)) : QString();
         if (currentLetter.toLower() != m_filterLetter.toLower()) {
             return false;
         }
     }
     if (!m_filterString.isEmpty()) {
-        QStringList allWords = m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleKeywords).toStringList();
-        allWords.prepend(m_source->data(m_source->index(source_row, 0), AppDrawerModelInterface::RoleName).toString());
+        const auto roles = {AppDrawerModelInterface::RoleAppId, AppDrawerModelInterface::RoleName,
+                            AppDrawerModelInterface::RoleDescription, AppDrawerModelInterface::RoleKeywords};
         bool found = false;
-        Q_FOREACH (const QString &currentWord, allWords) {
-            if (currentWord.startsWith(m_filterString, Qt::CaseInsensitive)) {
+        Q_FOREACH (const auto &role, roles) {
+            const QString data = m_source->data(idx, role).toString();
+            if (data.contains(m_filterString, Qt::CaseInsensitive)) {
                 found = true;
                 break;
             }

=== modified file 'qml/Launcher/Drawer.qml'
--- qml/Launcher/Drawer.qml	2017-03-24 11:51:31 +0000
+++ qml/Launcher/Drawer.qml	2017-04-06 13:50:59 +0000
@@ -79,6 +79,7 @@
             source: appDrawerModel
             filterString: searchField.displayText
             sortBy: AppDrawerProxyModel.SortByAToZ
+            dynamicSortFilter: false
         }
 
         Item {

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2017-04-06 13:50:59 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2017-04-06 13:50:59 +0000
@@ -72,6 +72,19 @@
     return m_keywords;
 }
 
+QString MockLauncherItem::description() const
+{
+    return m_description;
+}
+
+void MockLauncherItem::setDescription(const QString &description)
+{
+    if (m_description != description) {
+        m_description = description;
+        Q_EMIT descriptionChanged(m_description);
+    }
+}
+
 uint MockLauncherItem::popularity() const
 {
     return m_popularity;

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
--- tests/mocks/Unity/Launcher/MockLauncherItem.h	2017-04-06 13:50:59 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2017-04-06 13:50:59 +0000
@@ -40,6 +40,7 @@
     QString name() const override;
     QString icon() const override;
     QStringList keywords() const override;
+    QString description() const override;
     uint popularity() const override;
 
     bool pinned() const override;
@@ -56,6 +57,7 @@
 
 private:
     void setKeywords(const QStringList &keywords);
+    void setDescription(const QString &description);
     void setPopularity(uint popularity);
     void setPinned(bool pinned);
     void setRunning(bool running);
@@ -72,6 +74,7 @@
     QString m_name;
     QString m_icon;
     QStringList m_keywords;
+    QString m_description;
     uint m_popularity;
     bool m_pinned;
     bool m_running;

=== modified file 'tests/plugins/Unity/Launcher/appdrawermodeltest.cpp'
--- tests/plugins/Unity/Launcher/appdrawermodeltest.cpp	2017-04-06 13:50:59 +0000
+++ tests/plugins/Unity/Launcher/appdrawermodeltest.cpp	2017-04-06 13:50:59 +0000
@@ -24,16 +24,20 @@
     Q_OBJECT
 
 private:
-    AppDrawerModel *appDrawerModel;
+    AppDrawerModel *appDrawerModel{nullptr};
 
 private Q_SLOTS:
 
     void initTestCase() {
         UalWrapper::s_list << QStringLiteral("app1") << QStringLiteral("app2");
-        appDrawerModel = new AppDrawerModel(this);
+        appDrawerModel = new AppDrawerModel();
         QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 2);
     }
 
+    void cleanupTestCase() {
+        appDrawerModel->deleteLater();
+    }
+
     void testUalAppAddedRemoved() {
         QCOMPARE(appDrawerModel->rowCount(QModelIndex()), 2);
 

=== modified file 'tests/plugins/Unity/Launcher/ualwrapper.cpp'
--- tests/plugins/Unity/Launcher/ualwrapper.cpp	2017-04-06 13:50:59 +0000
+++ tests/plugins/Unity/Launcher/ualwrapper.cpp	2017-04-06 13:50:59 +0000
@@ -42,6 +42,7 @@
     info.name = "App_" + appId;
     info.icon = "/dummy/icon/path/" + appId + ".png";
     info.keywords << QStringLiteral("keyword1") << QStringLiteral("keyword2");
+    info.description = "Dummy description";
     info.popularity = 1;
     info.valid = true;
     return info;

=== modified file 'tests/plugins/Unity/Launcher/ualwrapper.h'
--- tests/plugins/Unity/Launcher/ualwrapper.h	2017-04-06 13:50:59 +0000
+++ tests/plugins/Unity/Launcher/ualwrapper.h	2017-04-06 13:50:59 +0000
@@ -28,6 +28,7 @@
         QString name;
         QString icon;
         QStringList keywords;
+        QString description;
         uint popularity = 0;
     };