Unity API

Merge lp:~unity-team/unity-api/miral into lp:unity-api

miral
Merge into trunk

Proposed by Daniel d'Andrada on 2016-11-03

Status:	Merged
Approved by:	Lukáš Tinkl on 2016-12-07
Approved revision:	no longer in the source branch.
Merged at revision:	259
Proposed branch:	lp:~unity-team/unity-api/miral
Merge into:	lp:unity-api
Diff against target:	848 lines (+392/-96) 21 files modified debian/changelog (+12/-0) include/unity/shell/application/ApplicationInfoInterface.h (+5/-0) include/unity/shell/application/ApplicationManagerInterface.h (+6/-0) include/unity/shell/application/CMakeLists.txt (+1/-1) include/unity/shell/application/Mir.h (+10/-1) include/unity/shell/application/MirFocusControllerInterface.h (+0/-69) include/unity/shell/application/MirSurfaceInterface.h (+36/-12) include/unity/shell/application/MirSurfaceItemInterface.h (+1/-2) include/unity/shell/application/SurfaceManagerInterface.h (+50/-0) include/unity/shell/launcher/AppDrawerModelInterface.h (+71/-0) include/unity/shell/launcher/CMakeLists.txt (+1/-1) include/unity/shell/launcher/LauncherItemInterface.h (+10/-6) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+2/-0) test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h (+2/-0) test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt (+2/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.cpp (+89/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.h (+38/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp (+14/-0) test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h (+6/-0) test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.cpp (+4/-0) test/qmltest/unity/shell/launcher/tst_Launcher.qml (+32/-4)
To merge this branch:	bzr merge lp:~unity-team/unity-api/miral
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-11-03	Approve on 2016-12-07
Unity8 CI Bot	continuous-integration		Approve on 2016-12-07
Review via email: mp+309938@code.launchpad.net

Commit message

unity::shell::application - changes for the miral way of doing things

Description of the change

Needed by:
https://code.launchpad.net/~dandrader/unity8/miral/+merge/312194
https://code.launchpad.net/~unity-team/qtmir/miral-qt-integration/+merge/310001

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-03:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-03:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-07:

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

review: Approve (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-17:

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

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity-api/miral updated on 2016-11-23

254. By CI Train Bot Account on 2016-11-23

Add hasSeparator role to quicklistModel.

255. By Marcus Tomlinson on 2016-11-23

Don't rely on glib error message strings in IniParser_test (LP: #1642673)

Approved by: Daniel d'Andrada, Unity8 CI Bot

256. By CI Train Bot Account on 2016-11-23

Releasing 7.120+17.04.20161123-0ubuntu1

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-01:

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

review: Approve (continuous-integration)

lp:~unity-team/unity-api/miral updated on 2016-12-05

257. By CI Train Bot Account on 2016-12-05: Add AppDrawerModelInterface
258. By CI Train Bot Account on 2016-12-05: Releasing 7.121+17.04.20161205-0ubuntu1

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-12-07:

virtual ApplicationInfoInterface *findApplicationWithSurface(MirSurfaceInterface* surface) = 0;

as it's a getter, it should have a const qualifier

+ add a description and clarify the commit message a bit please

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-07:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-12-07:

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

review: Approve (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-12-07:

LGTM, works fine with unity8/qtmir, CI passing too now

review: Approve

lp:~unity-team/unity-api/miral updated on 2016-12-12

259. By Daniel d'Andrada on 2016-12-12: unity::shel::application - changes for the miral way of doing things

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Unity Team

 === modified file 'debian/changelog'
 --- debian/changelog	2016-11-23 12:11:04 +0000
 +++ debian/changelog	2016-12-12 16:53:20 +0000
@@ -1,3 +1,15 @@
++unity-api (8.0) UNRELEASED; urgency=medium
++
++  * unity::shel::application - changes for the miral way of doing things
++
++ -- Daniel d'Andrada <daniel.dandrada@canonical.com>  Tue, 01 Nov 2016 17:25:38 -0200
++
++unity-api (7.121+17.04.20161205-0ubuntu1) zesty; urgency=medium
++
++  * Add AppDrawerModelInterface
++
++ -- Michael Zanetti <michael.zanetti@canonical.com>  Mon, 05 Dec 2016 15:20:31 +0000
++
  unity-api (7.120+17.04.20161123-0ubuntu1) zesty; urgency=medium
    [ Andrea Azzarone ]
 === modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
 --- include/unity/shell/application/ApplicationInfoInterface.h	2016-07-25 13:56:35 +0000
 +++ include/unity/shell/application/ApplicationInfoInterface.h	2016-12-12 16:53:20 +0000
@@ -282,6 +282,11 @@
          RequestedSuspended = Suspended
      };
++    /**
++     * @brief Closes the application
++     */
++    virtual void close() = 0;
++
      /// @cond
      virtual ~ApplicationInfoInterface() {}
 === modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
 --- include/unity/shell/application/ApplicationManagerInterface.h	2016-07-25 13:56:35 +0000
 +++ include/unity/shell/application/ApplicationManagerInterface.h	2016-12-12 16:53:20 +0000
@@ -33,6 +33,7 @@
+ {
  class ApplicationInfoInterface;
++class MirSurfaceInterface;
  /**
   * @brief The Application manager
@@ -134,6 +135,11 @@
       */
      Q_INVOKABLE virtual unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const = 0;
++    /*
++     * @brief Returns the AplicationInfo with the given surface
++     */
++    virtual ApplicationInfoInterface *findApplicationWithSurface(MirSurfaceInterface* surface) const = 0;
++
      /**
       * @brief Request to focus a given application
+      *
 === modified file 'include/unity/shell/application/CMakeLists.txt'
 --- include/unity/shell/application/CMakeLists.txt	2016-09-05 13:21:24 +0000
 +++ include/unity/shell/application/CMakeLists.txt	2016-12-12 16:53:20 +0000
@@ -7,7 +7,7 @@
  set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
--set(VERSION 22)
++set(VERSION 23)
  set(PKGCONFIG_NAME "unity-shell-application")
  set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
  set(PKGCONFIG_REQUIRES "Qt5Core")
 === modified file 'include/unity/shell/application/Mir.h'
 --- include/unity/shell/application/Mir.h	2016-02-17 12:56:18 +0000
 +++ include/unity/shell/application/Mir.h	2016-12-12 16:53:20 +0000
@@ -63,9 +63,15 @@
          RestoredState,
          MinimizedState,
          MaximizedState,
--        VertMaximizedState,
          FullscreenState,
++        MaximizedLeftState,
++        MaximizedRightState,
          HorizMaximizedState,
++        VertMaximizedState,
++        MaximizedTopLeftState,
++        MaximizedTopRightState,
++        MaximizedBottomLeftState,
++        MaximizedBottomRightState,
          HiddenState,
      };
@@ -110,7 +116,10 @@
      /// @endcond
  };
++Q_DECLARE_METATYPE(Mir::Type)
++Q_DECLARE_METATYPE(Mir::State)
  Q_DECLARE_METATYPE(Mir::OrientationAngle)
  Q_DECLARE_METATYPE(Mir::ShellChrome)
++Q_DECLARE_METATYPE(Mir::FormFactor)
  #endif // UNITY_SHELL_APPLICATION_MIR_H
 === removed file 'include/unity/shell/application/MirFocusControllerInterface.h'
 --- include/unity/shell/application/MirFocusControllerInterface.h	2016-04-13 16:47:27 +0000
 +++ include/unity/shell/application/MirFocusControllerInterface.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical, Ltd.
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; version 3.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--#ifndef UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
--#define UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
--
--#include <QObject>
--
--namespace unity {
--namespace shell {
--namespace application {
--
--class MirSurfaceInterface;
--
--/**
-- * @brief Defines which MirSurface has focus
-- *
-- * Even though QQuickWindow::activeFocusItem is who ultimately defines the focused MirSurface
-- * in the QML scene, the two might not necessarily match all the time. And also this is a cleaner
-- * way of keeping tabs on the focused MirSurface as it doesn't involve unrelated QML items.
-- */
--class MirFocusControllerInterface : public QObject
--{
--    Q_OBJECT
--
--    /**
--     * @brief The MirSurface which currently has focus, if any.
--     *
--     * Shell provides this information.
--     *
--     * But it can also be changed by the implementation. When a MirSurfaceItem gets active
--     * focus from the QML scene, it will also call MirFocusController::setFocusedSurface for
--     * the MirSurface it holds.
--     */
--    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* focusedSurface READ focusedSurface
--                                                                              WRITE setFocusedSurface
--                                                                              NOTIFY focusedSurfaceChanged)
--public:
--    /// @cond
--    MirFocusControllerInterface(QObject *parent = 0) : QObject(parent) {}
--    virtual ~MirFocusControllerInterface() {}
--
--    virtual void setFocusedSurface(MirSurfaceInterface *surface) = 0;
--    virtual MirSurfaceInterface* focusedSurface() const = 0;
--    /// @endcond
--Q_SIGNALS:
--    /// @cond
--    void focusedSurfaceChanged();
--    /// @endcond
--};
--
--} // namespace application
--} // namespace shell
--} // namespace unity
--
--#endif // UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
 === modified file 'include/unity/shell/application/MirSurfaceInterface.h'
 --- include/unity/shell/application/MirSurfaceInterface.h	2016-09-05 13:21:24 +0000
 +++ include/unity/shell/application/MirSurfaceInterface.h	2016-12-12 16:53:20 +0000
@@ -58,6 +58,16 @@
      Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
      /**
++     * @brief Position of the current surface buffer, in pixels.
++     */
++    Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
++
++    /**
++     * @brief Requested position of the current surface buffer, in pixels.
++     */
++    Q_PROPERTY(QPoint requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged)
++
++    /**
       * @brief Size of the current surface buffer, in pixels.
       */
      Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
@@ -65,7 +75,7 @@
      /**
       * @brief State of the surface
       */
--    Q_PROPERTY(Mir::State state READ state WRITE setState NOTIFY stateChanged)
++    Q_PROPERTY(Mir::State state READ state NOTIFY stateChanged)
      /**
       * @brief True if it has a mir client bound to it.
@@ -165,12 +175,13 @@
      virtual QString persistentId() const = 0;
++    virtual QPoint position() const = 0;
++
      virtual QSize size() const = 0;
      virtual void resize(int width, int height) = 0;
      virtual void resize(const QSize &size) = 0;
      virtual Mir::State state() const = 0;
--    virtual void setState(Mir::State qmlState) = 0;
      virtual bool live() const = 0;
@@ -196,25 +207,29 @@
      virtual QRect inputBounds() const = 0;
      virtual bool confinesMousePointer() const = 0;
++
++    virtual QPoint requestedPosition() const = 0;
++    virtual void setRequestedPosition(const QPoint &) = 0;
      /// @endcond
      /**
--     * @brief Requests focus for this surface
--     *
--     * Causes the emission of focusRequested()
--     */
--    Q_INVOKABLE virtual void requestFocus() = 0;
--
--    /**
       * @brief Sends a close request
+      *
       */
      Q_INVOKABLE virtual void close() = 0;
      /**
--     * @brief Raises this surface to be the first/top one among its siblings
--     */
--    Q_INVOKABLE virtual void raise() = 0;
++     * @brief Activates this surface
++     *
++     * It will get focused and raised
++     */
++    Q_INVOKABLE virtual void activate() = 0;
++
++public Q_SLOTS:
++    /**
++     * @brief Requests a change to the specified state
++     */
++    virtual void requestState(Mir::State state) = 0;
  Q_SIGNALS:
      /// @cond
@@ -223,6 +238,8 @@
      void visibleChanged(bool visible);
      void stateChanged(Mir::State value);
      void orientationAngleChanged(Mir::OrientationAngle value);
++    void positionChanged(QPoint position);
++    void requestedPositionChanged(QPoint position);
      void sizeChanged(const QSize &value);
      void nameChanged(const QString &name);
      void minimumWidthChanged(int value);
@@ -240,8 +257,15 @@
      /**
       * @brief Emitted in response to a requestFocus() call
++     *
++     * If shell agrees with it, it should call activate() on this surface
       */
      void focusRequested();
++
++    /**
++     * @brief Emitted when close() is called
++     */
++    void closeRequested();
  };
  } // namespace application
 === modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
 --- include/unity/shell/application/MirSurfaceItemInterface.h	2016-03-11 10:39:33 +0000
 +++ include/unity/shell/application/MirSurfaceItemInterface.h	2016-12-12 16:53:20 +0000
@@ -56,7 +56,7 @@
      /**
       * @brief State of the given surface or Mir.UnknownState if no surface is set
       */
--    Q_PROPERTY(Mir::State surfaceState READ surfaceState WRITE setSurfaceState NOTIFY surfaceStateChanged)
++    Q_PROPERTY(Mir::State surfaceState READ surfaceState NOTIFY surfaceStateChanged)
      /**
       * @brief Name of the given surface or an empty string if no surface is set
@@ -128,7 +128,6 @@
      virtual bool live() const = 0;
      virtual Mir::State surfaceState() const = 0;
--    virtual void setSurfaceState(Mir::State) = 0;
      virtual Mir::OrientationAngle orientationAngle() const = 0;
      virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
 === added file 'include/unity/shell/application/SurfaceManagerInterface.h'
 --- include/unity/shell/application/SurfaceManagerInterface.h	1970-01-01 00:00:00 +0000
 +++ include/unity/shell/application/SurfaceManagerInterface.h	2016-12-12 16:53:20 +0000
@@ -0,0 +1,50 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef UNITY_SHELL_APPLICATION_SURFACEMANAGERINTERFACE_H
++#define UNITY_SHELL_APPLICATION_SURFACEMANAGERINTERFACE_H
++
++#include <QObject>
++#include <QVector>
++
++namespace unity {
++namespace shell {
++namespace application {
++
++class MirSurfaceInterface;
++
++class SurfaceManagerInterface : public QObject
++{
++    Q_OBJECT
++
++public:
++    virtual ~SurfaceManagerInterface() {}
++
++    virtual void raise(MirSurfaceInterface *surface) = 0;
++    virtual void activate(MirSurfaceInterface *surface) = 0;
++
++Q_SIGNALS:
++    void surfaceCreated(MirSurfaceInterface *surface);
++    void surfacesRaised(const QVector<MirSurfaceInterface*> &surfaces);
++    void modificationsStarted();
++    void modificationsEnded();
++};
++
++} // namespace application
++} // namespace shell
++} // namespace unity
++
++#endif // UNITY_SHELL_APPLICATION_SURFACEMANAGERINTERFACE_H
 === added file 'include/unity/shell/launcher/AppDrawerModelInterface.h'
 --- include/unity/shell/launcher/AppDrawerModelInterface.h	1970-01-01 00:00:00 +0000
 +++ include/unity/shell/launcher/AppDrawerModelInterface.h	2016-12-12 16:53:20 +0000
@@ -0,0 +1,71 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <unity/SymbolExport.h>
++
++#include <QAbstractListModel>
++
++namespace unity {
++namespace shell {
++namespace launcher {
++
++/**
++ * @brief A list of app drawer items to be displayed
++ *
++ * This model exposes all the items that should be shown in the app drawer.
++ */
++class UNITY_API AppDrawerModelInterface: public QAbstractListModel
++{
++    Q_OBJECT
++    Q_ENUMS(Roles)
++public:
++    /**
++     * @brief The Roles supported by the model
++     *
++     * See LauncherItemInterface properties for details.
++     */
++    enum Roles {
++        RoleAppId,
++        RoleName,
++        RoleIcon,
++        RoleKeywords,
++        RoleUsage
++    };
++
++    /// @cond
++    AppDrawerModelInterface(QObject* parent = nullptr): QAbstractListModel(parent) {}
++    /// @endcond
++
++    virtual ~AppDrawerModelInterface() {}
++
++    /// @cond
++    QHash<int, QByteArray> roleNames() const override {
++        QHash<int, QByteArray> roles;
++        roles.insert(RoleAppId, "appId");
++        roles.insert(RoleName, "name");
++        roles.insert(RoleIcon, "icon");
++        roles.insert(RoleKeywords, "keywords");
++        roles.insert(RoleUsage, "usage");
++        return roles;
++    }
++    /// @endcond
++};
++
++}
++}
++}
 === modified file 'include/unity/shell/launcher/CMakeLists.txt'
 --- include/unity/shell/launcher/CMakeLists.txt	2016-10-28 11:51:20 +0000
 +++ include/unity/shell/launcher/CMakeLists.txt	2016-12-12 16:53:20 +0000
@@ -7,7 +7,7 @@
  set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
--set(VERSION 10)
++set(VERSION 11)
  set(PKGCONFIG_NAME "unity-shell-launcher")
  set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
  set(PKGCONFIG_REQUIRES "Qt5Core")
 === modified file 'include/unity/shell/launcher/LauncherItemInterface.h'
 --- include/unity/shell/launcher/LauncherItemInterface.h	2016-05-11 10:48:13 +0000
 +++ include/unity/shell/launcher/LauncherItemInterface.h	2016-12-12 16:53:20 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-2106 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  #ifndef UNITY_SHELL_LAUNCHER_LAUNCHERITEM_H
@@ -52,12 +49,17 @@
      /**
       * @brief The user visible name of the item.
       */
--    Q_PROPERTY(QString name READ name CONSTANT)
++    Q_PROPERTY(QString name READ name NOTIFY nameChanged)
      /**
       * @brief The full path to the icon to be shown for the item.
       */
--    Q_PROPERTY(QString icon READ icon CONSTANT)
++    Q_PROPERTY(QString icon READ icon NOTIFY iconChanged)
++
++    /**
++     * @brief The keywords for this item.
++     */
++    Q_PROPERTY(QStringList keywords READ keywords NOTIFY keywordsChanged)
      /**
       * @brief A flag whether the item is pinned or not
@@ -137,6 +139,7 @@
      virtual QString appId() const = 0;
      virtual QString name() const = 0;
      virtual QString icon() const = 0;
++    virtual QStringList keywords() const = 0;
      virtual bool pinned() const = 0;
      virtual bool running() const = 0;
      virtual bool recent() const = 0;
@@ -151,6 +154,7 @@
  Q_SIGNALS:
      void nameChanged(const QString &name);
      void iconChanged(const QString &icon);
++    void keywordsChanged(const QStringList &keywords);
      void pinnedChanged(bool pinned);
      void runningChanged(bool running);
      void recentChanged(bool running);
 === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
 --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-07-25 13:56:35 +0000
 +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-12-12 16:53:20 +0000
@@ -29,6 +29,8 @@
  public:
      MockApplicationInfo(const QString &appId, const QString& name, const QString& comment, const QUrl& icon, QObject* parent = 0);
++    void close() override {}
++
      QString appId() const;
      QString name() const;
      QString comment() const;
 === modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h'
 --- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2015-06-19 12:02:05 +0000
 +++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.h	2016-12-12 16:53:20 +0000
@@ -44,6 +44,8 @@
      Q_INVOKABLE unity::shell::application::ApplicationInfoInterface *findApplication(const QString &appId) const;
++    ApplicationInfoInterface *findApplicationWithSurface(MirSurfaceInterface*) const override { return nullptr; }
++
      Q_INVOKABLE bool requestFocusApplication(const QString &appId);
      Q_INVOKABLE bool focusApplication(const QString &appId);
 === modified file 'test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt'
 --- test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt	2014-09-03 22:59:26 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/CMakeLists.txt	2016-12-12 16:53:20 +0000
@@ -16,11 +16,13 @@
      ${CMAKE_SOURCE_DIR}/include/unity/shell/launcher/LauncherModelInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/launcher/LauncherItemInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/launcher/QuickListModelInterface.h
++    ${CMAKE_SOURCE_DIR}/include/unity/shell/launcher/AppDrawerModelInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/application/ApplicationManagerInterface.h
      ${CMAKE_SOURCE_DIR}/include/unity/shell/application/ApplicationInfoInterface.h
      Mocks/MockLauncherModel.cpp
      Mocks/MockLauncherItem.cpp
      Mocks/MockQuickListModel.cpp
++    Mocks/MockAppDrawerModel.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/../Application/Mocks/MockApplicationManager.cpp
      ${CMAKE_CURRENT_SOURCE_DIR}/../Application/Mocks/MockApplicationInfo.cpp
+ )
 === added file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.cpp'
 --- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.cpp	1970-01-01 00:00:00 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.cpp	2016-12-12 16:53:20 +0000
@@ -0,0 +1,89 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <Mocks/MockAppDrawerModel.h>
++#include <Mocks/MockLauncherItem.h>
++
++using namespace unity::shell::launcher;
++
++MockAppDrawerModel::MockAppDrawerModel(QObject* parent): AppDrawerModelInterface(parent)
++{
++    MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("camera-app", "/usr/share/applications/camera-app.desktop", "Camera", "camera", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("gallery-app", "/usr/share/applications/gallery-app.desktop", "Gallery", "gallery", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("facebook-webapp", "/usr/share/applications/facebook-webapp.desktop", "Facebook", "facebook", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("twitter-webapp", "/usr/share/applications/twitter-webapp.desktop", "Twitter", "twitter", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("gmail-webapp", "/usr/share/applications/gmail-webapp.desktop", "GMail", "gmail", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("ubuntu-weather-app", "/usr/share/applications/ubuntu-weather-app.desktop", "Weather", "weather", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("notes-app", "/usr/share/applications/notes-app.desktop", "Notepad", "notepad", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++    item = new MockLauncherItem("ubuntu-calendar-app", "/usr/share/applications/ubuntu-calendar-app.desktop","Calendar", "calendar", this);
++    item->setKeywords({"keyword1", "keyword2"});
++    m_list.append(item);
++}
++
++MockAppDrawerModel::~MockAppDrawerModel()
++{
++    while (!m_list.empty())
++    {
++        m_list.takeFirst()->deleteLater();
++    }
++}
++
++// cppcheck-suppress unusedFunction
++int MockAppDrawerModel::rowCount(const QModelIndex& parent) const
++{
++    Q_UNUSED(parent)
++    return m_list.count();
++}
++
++QVariant MockAppDrawerModel::data(const QModelIndex& index, int role) const
++{
++    LauncherItemInterface *item = m_list.at(index.row());
++    switch(role)
++    {
++    case RoleAppId:
++        return item->appId();
++    case RoleName:
++        return item->name();
++    case RoleIcon:
++        return item->icon();
++    case RoleKeywords:
++        return item->keywords();
++    case RoleUsage:
++        return 1;
++    }
++
++    return QVariant();
++}
 === added file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.h'
 --- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.h	1970-01-01 00:00:00 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockAppDrawerModel.h	2016-12-12 16:53:20 +0000
@@ -0,0 +1,38 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#pragma once
++
++#include <AppDrawerModelInterface.h>
++
++class MockLauncherItem;
++
++using namespace unity::shell::launcher;
++
++class UNITY_API MockAppDrawerModel: public AppDrawerModelInterface
++{
++   Q_OBJECT
++
++public:
++    MockAppDrawerModel(QObject* parent = 0);
++    ~MockAppDrawerModel();
++
++    int rowCount(const QModelIndex& parent) const override;
++    QVariant data(const QModelIndex& index, int role) const override;
++
++private:
++    QList<MockLauncherItem*> m_list;
++};
 === modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp'
 --- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2016-05-18 13:43:40 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.cpp	2016-12-12 16:53:20 +0000
@@ -61,6 +61,20 @@
      return m_icon;
+ }
++QStringList MockLauncherItem::keywords() const
++{
++    return m_keywords;
++}
++
++void MockLauncherItem::setKeywords(const QStringList &keywords)
++{
++    if (m_keywords != keywords)
++    {
++        m_keywords = keywords;
++        Q_EMIT keywordsChanged(m_keywords);
++    }
++}
++
  bool MockLauncherItem::pinned() const
+ {
      return m_pinned;
 === modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h'
 --- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2016-05-18 13:43:40 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherItem.h	2016-12-12 16:53:20 +0000
@@ -22,6 +22,8 @@
  #include <LauncherItemInterface.h>
++#include <QStringList>
++
  using namespace unity::shell::launcher;
  class UNITY_API MockLauncherItem: public LauncherItemInterface
@@ -35,6 +37,9 @@
      QString name() const;
      QString icon() const;
++    QStringList keywords() const;
++    void setKeywords(const QStringList &keywords);
++
      bool pinned() const;
      void setPinned(bool pinned);
@@ -67,6 +72,7 @@
      QString m_desktopFile;
      QString m_name;
      QString m_icon;
++    QStringList m_keywords;
      bool m_pinned;
      bool m_running;
      bool m_recent;
 === modified file 'test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.cpp'
 --- test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.cpp	2013-09-11 15:28:22 +0000
 +++ test/qmltest/mocks/plugins/Unity/Launcher/TestLauncherPlugin.cpp	2016-12-12 16:53:20 +0000
@@ -21,9 +21,11 @@
  #include <Mocks/MockLauncherModel.h>
  #include <Mocks/MockLauncherItem.h>
  #include <Mocks/MockQuickListModel.h>
++#include <Mocks/MockAppDrawerModel.h>
  #include <LauncherModelInterface.h>
  #include <LauncherItemInterface.h>
++#include <AppDrawerModelInterface.h>
  #include <QtQml/qqml.h>
@@ -42,10 +44,12 @@
      qmlRegisterUncreatableType<LauncherModelInterface>(uri, 0, 1, "LauncherModelInterface", "Interface for the LauncherModel");
      qmlRegisterUncreatableType<LauncherItemInterface>(uri, 0, 1, "LauncherItemInterface", "Interface for the LauncherItem");
      qmlRegisterUncreatableType<QuickListModelInterface>(uri, 0, 1, "QuickListModelInterface", "Interface for the QuickListModel");
++    qmlRegisterUncreatableType<AppDrawerModelInterface>(uri, 0, 1, "AppDrawerModelInterface", "Interface for the AppDrawerModel");
      qmlRegisterSingletonType<MockLauncherModel>(uri, 0, 1, "LauncherModel", modelProvider);
      qmlRegisterUncreatableType<MockLauncherItem>(uri, 0, 1, "LauncherItem", "Can't create LauncherItems in QML. Get them from the LauncherModel");
      qmlRegisterUncreatableType<MockQuickListModel>(uri, 0, 1, "QuickListModel", "Can't create QuickListModels in QML. Get them from the LauncherItems");
++    qmlRegisterType<MockAppDrawerModel>(uri, 0, 1, "AppDrawerModel");
      // Need to register the appmanager here ourselves as there won't be a real AppManager plugin in this test
      qmlRegisterUncreatableType<unity::shell::application::ApplicationManagerInterface>(uri, 0, 1, "ApplicationManagerInterface", "Interface for the ApplicationManager");
 === modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
 --- test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-10-28 11:14:37 +0000
 +++ test/qmltest/unity/shell/launcher/tst_Launcher.qml	2016-12-12 16:53:20 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright 2013 Canonical Ltd.
++ * Copyright 2013-2016 Canonical Ltd.
+  *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
+  *
   * You should have received a copy of the GNU Lesser General Public License
   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors:
-- *      Michael Zanetti <michael.zanetti@canonical.com>
   */
  import QtQuick 2.0
@@ -67,6 +64,15 @@
+             }
+         }
++
++        Repeater {
++            id: appDrawerRepeater
++            model: AppDrawerModel {}
++            delegate: Item {
++                property var roles: model
++            }
++        }
++
          function initTestCase() {
              if (repeater.count < 5) {
                  print("This Test Suite requires at least 5 items in the model.")
@@ -138,6 +144,7 @@
                  { tag: "Item.properties[appId]", constant: "appId", type: "string" },
                  { tag: "Item.properties[name]", constant: "name", type: "string" },
                  { tag: "Item.properties[icon]", constant: "icon", type: "string" },
++                { tag: "Item.properties[keywords]", constant: "keywords", type: "object" },
                  { tag: "Item.properties[pinned]", property: "pinned", type: "boolean" },
                  { tag: "Item.properties[recent]", property: "recent", type: "boolean" },
                  { tag: "Item.properties[running]", property: "running", type: "boolean" },
@@ -182,5 +189,26 @@
              verifyData(data);
+         }
++
++        function test_appdrawer_model_roles_data() {
++            return [
++                { tag: "Model.roles[appId]", role: "appId", type: "string" },
++                { tag: "Model.roles[name]", role: "name", type: "string" },
++                { tag: "Model.roles[icon]", role: "icon", type: "string" },
++                { tag: "Model.roles[keywords]", role: "keywords", type: "object" },
++                { tag: "Model.roles[usage]", role: "usage", type: "number" },
++            ];
++        }
++
++        function test_appdrawer_model_roles(data) {
++            name = "AppDrawerModel"
++            try {
++                object = appDrawerRepeater.itemAt(0).roles;
++            } catch(err) {
++                object = undefined;
++            }
++
++            verifyData(data);
++        }
+     }
+ }