Unity 8

Merge lp:~mzanetti/unity8/launcher-surfaceCount-pips into lp:unity8

launcher-surfaceCount-pips
Merge into trunk

Proposed by Michael Zanetti on 2016-06-03

Status:	Merged
Approved by:	Lukáš Tinkl on 2016-06-06
Approved revision:	2406
Merged at revision:	2449
Proposed branch:	lp:~mzanetti/unity8/launcher-surfaceCount-pips
Merge into:	lp:unity8
Prerequisite:	lp:~dandrader/unity8/promptsZOrder
Diff against target:	930 lines (+176/-237) 24 files modified CMakeLists.txt (+1/-1) debian/control (+1/-1) plugins/Greeter/Unity/Launcher/CMakeLists.txt (+1/-1) plugins/Greeter/Unity/Launcher/launcheritem.cpp (+14/-0) plugins/Greeter/Unity/Launcher/launcheritem.h (+3/-1) plugins/Greeter/Unity/Launcher/launchermodelas.cpp (+2/-0) plugins/Unity/Launcher/CMakeLists.txt (+3/-1) plugins/Unity/Launcher/Launcher.qmltypes (+0/-182) plugins/Unity/Launcher/launcheritem.cpp (+14/-0) plugins/Unity/Launcher/launcheritem.h (+3/-0) plugins/Unity/Launcher/launchermodel.cpp (+29/-2) plugins/Unity/Launcher/launchermodel.h (+1/-0) qml/Launcher/LauncherDelegate.qml (+3/-1) qml/Launcher/LauncherPanel.qml (+1/-0) tests/mocks/Unity/Application/ApplicationInfo.cpp (+29/-27) tests/mocks/Unity/Application/ApplicationInfo.h (+5/-4) tests/mocks/Unity/Application/MirSurfaceListModel.cpp (+3/-3) tests/mocks/Unity/Launcher/CMakeLists.txt (+1/-1) tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+14/-0) tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+5/-0) tests/plugins/Unity/Launcher/CMakeLists.txt (+1/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+14/-2) tests/qmltests/Launcher/tst_Launcher.qml (+25/-9)
To merge this branch:	bzr merge lp:~mzanetti/unity8/launcher-surfaceCount-pips
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-06-03	Needs Fixing on 2016-06-06
Lukáš Tinkl (community)		2016-06-03	Approve on 2016-06-06
Albert Astals Cid (community)	merges fine	2016-06-03	Abstain on 2016-06-06
Daniel d'Andrada		2016-06-03	Pending
Review via email: mp+296455@code.launchpad.net

This proposal supersedes a proposal from 2016-05-10.

Commit message

Add support for the launcher surface pips displaying the correct number of surfaces

Description of the change

To test this, you can install this app:
http://notyetthere.org/data/multiwindow.mzanetti_0.1_all.click

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

https://code.launchpad.net/~mzanetti/unity-api/surfaceCount-property/+merge/294264
https://code.launchpad.net/~mzanetti/qtmir/surfaceCount-property/+merge/294265

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

yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

yes

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

no real ui change, just showing more of the pips, as requested by design

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-10: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-05-10: Posted in a previous version of this proposal

Test fails with:

FAIL! : qmltestrunner::Launcher::test_surfaceCountPips() Compared values are not the same
   Actual (): 0
   Expected (): NaN
   Loc: [/home/ltinkl/bzr/unity8/launcher-surfaceCount-pips/tests/qmltests/Launcher/tst_Launcher.qml(1298)]

review: Needs Fixing

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-05-10: Posted in a previous version of this proposal

Please either update or nuke (prefered) Launcher.qmltypes

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-05-11: Posted in a previous version of this proposal

> Please either update or nuke (prefered) Launcher.qmltypes

done

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-05-11: Posted in a previous version of this proposal

> Please either update or nuke (prefered) Launcher.qmltypes

I can't see this happening here and from your log output it doesn't seem to make too much sense either atm. How are you launching the test? just make xvfbtestLauncher?

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-11: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-05-11: Posted in a previous version of this proposal

Cool, no more objections from my side, works as expected

* 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.

Not, due to unity-api changes, passes locally

review: Approve

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-05-11: Posted in a previous version of this proposal

Coding style:

"""
void LauncherModel::applicationSurfaceCountChanged(int count)
"""

You're naming a method like signal.

"""
ApplicationInfoInterface *app = static_cast<ApplicationInfoInterface*>(sender());
"""

You wouldn't have to do that if this method received the relevant application as a parameter.

This QOject::sender() has a bad reputation: http://doc.qt.io/qt-5/qobject.html#sender

review: Needs Fixing

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-05-11: Posted in a previous version of this proposal

seriously? can't we move on from this useless nitpicking please? I know what I'm doing with with the call to sender(). If you read through your link, you'll see that none of the warnings are an issue in this case. One the other branch you suggest to use a lambda to capture pointers that might vanish independently from the actual thing you connect to. *that* is an issue, not the proper use of the sender() method. It seems you are starting to contradict yourself in your own reviews. I don't think this is useful any more.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2016-05-18: Posted in a previous version of this proposal

Here I use surfaceList::count instead of application::surfaceCount and got no crashes (both on phone and laptop):
http://bazaar.launchpad.net/~dandrader/unity8/launcher-surfaceCount-pips/revision/2398

As the documentation says about sender(), "This function violates the object-oriented principle of modularity.", even if you're using it correctly.

I've been using lambdas extensively with Qt signal/slot connections for a while now and they're working fine.

I still think Application::surfaceCount is redundant.

A side comment: regardless of whether you use lambdas and surfaceList::count or not, in LauncherModel::applicationRemoved you should disconnect what you connected in LauncherModel::applicationAdded.

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-05-19: Posted in a previous version of this proposal

Text conflict in tests/mocks/Unity/Application/ApplicationInfo.h
Text conflict in tests/mocks/Unity/Application/MirSurfaceListModel.cpp
Text conflict in tests/plugins/Unity/Launcher/launchermodeltest.cpp
3 conflicts encountered.

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-05-19: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-05-19: Posted in a previous version of this proposal

Nice, still works as expected; re-tested after recent fixes and merges

* 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.

Not, due to unity-api changes, passes locally

review: Approve

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-03: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-04:

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

review: Needs Fixing (continuous-integration)

lp:~mzanetti/unity8/launcher-surfaceCount-pips updated on 2016-06-06

2406. By Michael Zanetti on 2016-06-06: fix broken mock

Revision history for this message

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

Approving after the prereq rebase, let's wait for CI and silo testing for top approval

review: Approve

Revision history for this message

Albert Astals Cid (aacid) on 2016-06-06:

review: Abstain (merges fine)

Revision history for this message

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

Tested in silo 25, works as expected.

review: Approve

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

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:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-05-27 13:54:26 +0000
 +++ CMakeLists.txt	2016-06-06 14:13:23 +0000
@@ -57,7 +57,7 @@
  find_package(Qt5Concurrent 5.4 REQUIRED)
  find_package(Qt5Sql 5.4 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=17)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
  pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
  pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
  pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
 === modified file 'debian/control'
 --- debian/control	2016-05-27 13:54:26 +0000
 +++ debian/control	2016-06-06 14:13:23 +0000
@@ -32,7 +32,7 @@
                 libubuntugestures5-dev,
                 libubuntugestures5-private-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.113),
++               libunity-api-dev (>= 7.114),
                 libusermetricsoutput1-dev,
  # Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
                 libx11-dev[!armhf],
 === modified file 'plugins/Greeter/Unity/Launcher/CMakeLists.txt'
 --- plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-08-03 13:47:44 +0000
 +++ plugins/Greeter/Unity/Launcher/CMakeLists.txt	2016-06-06 14:13:23 +0000
@@ -1,4 +1,4 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
  add_definitions(-DSM_BUSNAME=systemBus)
 === modified file 'plugins/Greeter/Unity/Launcher/launcheritem.cpp'
 --- plugins/Greeter/Unity/Launcher/launcheritem.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Greeter/Unity/Launcher/launcheritem.cpp	2016-06-06 14:13:23 +0000
@@ -32,6 +32,7 @@
      m_countVisible(false),
      m_focused(false),
      m_alerting(false),
++    m_surfaceCount(0),
      m_quickList(new QuickListModel(this))
+ {
      QuickListEntry nameAction;
@@ -179,6 +180,19 @@
+     }
+ }
++int LauncherItem::surfaceCount() const
++{
++    return m_surfaceCount;
++}
++
++void LauncherItem::setSurfaceCount(int surfaceCount)
++{
++    if (m_surfaceCount != surfaceCount) {
++        m_surfaceCount = surfaceCount;
++        Q_EMIT surfaceCountChanged(surfaceCount);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'plugins/Greeter/Unity/Launcher/launcheritem.h'
 --- plugins/Greeter/Unity/Launcher/launcheritem.h	2015-06-02 13:50:46 +0000
 +++ plugins/Greeter/Unity/Launcher/launcheritem.h	2016-06-06 14:13:23 +0000
@@ -42,6 +42,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    int surfaceCount() const override;
      unity::shell::launcher::QuickListModelInterface *quickList() const override;
@@ -56,7 +57,7 @@
      void setCountVisible(bool countVisible);
      void setFocused(bool focused);
      void setAlerting(bool alerting);
--
++    void setSurfaceCount(int surfaceCount);
  private:
      QString m_appId;
@@ -70,6 +71,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    int m_surfaceCount;
      QuickListModel *m_quickList;
      friend class LauncherModel;
 === modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.cpp'
 --- plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2015-10-26 14:05:14 +0000
 +++ plugins/Greeter/Unity/Launcher/launchermodelas.cpp	2016-06-06 14:13:23 +0000
@@ -69,6 +69,8 @@
              return item->focused();
          case RoleRunning:
              return item->running();
++        case RoleSurfaceCount:
++            return item->surfaceCount();
+     }
      return QVariant();
 === modified file 'plugins/Unity/Launcher/CMakeLists.txt'
 --- plugins/Unity/Launcher/CMakeLists.txt	2016-04-19 20:36:29 +0000
 +++ plugins/Unity/Launcher/CMakeLists.txt	2016-06-06 14:13:23 +0000
@@ -1,4 +1,4 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
  add_definitions(-DSM_BUSNAME=systemBus)
@@ -23,6 +23,8 @@
      asadapter.cpp
      ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
      ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
++    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
++    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
      ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
 === removed file 'plugins/Unity/Launcher/Launcher.qmltypes'
 --- plugins/Unity/Launcher/Launcher.qmltypes	2015-02-13 09:01:16 +0000
 +++ plugins/Unity/Launcher/Launcher.qmltypes	1970-01-01 00:00:00 +0000
@@ -1,182 +0,0 @@
--import QtQuick.tooling 1.1
--
--// This file describes the plugin-supplied types contained in the library.
--// It is used for QML tooling purposes only.
--//
--// This file was auto-generated by:
--// 'qmlplugindump -notrelocatable Unity.Launcher 0.1 plugins'
--
--Module {
--    Component {
--        name: "LauncherItem"
--        prototype: "unity::shell::launcher::LauncherItemInterface"
--        exports: ["Unity.Launcher/LauncherItem 0.1"]
--        isCreatable: false
--        exportMetaObjectRevisions: [0]
--    }
--    Component {
--        name: "LauncherModel"
--        prototype: "unity::shell::launcher::LauncherModelInterface"
--        exports: ["Unity.Launcher/LauncherModel 0.1"]
--        isCreatable: false
--        isSingleton: true
--        exportMetaObjectRevisions: [0]
--        Method {
--            name: "requestRemove"
--            Parameter { name: "appId"; type: "string" }
--        }
--        Method { name: "refresh" }
--        Method {
--            name: "get"
--            type: "unity::shell::launcher::LauncherItemInterface*"
--            Parameter { name: "index"; type: "int" }
--        }
--        Method {
--            name: "move"
--            Parameter { name: "oldIndex"; type: "int" }
--            Parameter { name: "newIndex"; type: "int" }
--        }
--        Method {
--            name: "pin"
--            Parameter { name: "appId"; type: "string" }
--            Parameter { name: "index"; type: "int" }
--        }
--        Method {
--            name: "pin"
--            Parameter { name: "appId"; type: "string" }
--        }
--        Method {
--            name: "quickListActionInvoked"
--            Parameter { name: "appId"; type: "string" }
--            Parameter { name: "actionIndex"; type: "int" }
--        }
--        Method {
--            name: "setUser"
--            Parameter { name: "username"; type: "string" }
--        }
--        Method {
--            name: "getUrlForAppId"
--            type: "string"
--            Parameter { name: "appId"; type: "string" }
--        }
--    }
--    Component {
--        name: "QuickListModel"
--        prototype: "unity::shell::launcher::QuickListModelInterface"
--        exports: ["Unity.Launcher/QuickListModel 0.1"]
--        isCreatable: false
--        exportMetaObjectRevisions: [0]
--    }
--    Component {
--        name: "unity::shell::launcher::LauncherItemInterface"
--        prototype: "QObject"
--        exports: ["Unity.Launcher/LauncherItemInterface 0.1"]
--        isCreatable: false
--        exportMetaObjectRevisions: [0]
--        Property { name: "appId"; type: "string"; isReadonly: true }
--        Property { name: "name"; type: "string"; isReadonly: true }
--        Property { name: "icon"; type: "string"; isReadonly: true }
--        Property { name: "pinned"; type: "bool"; isReadonly: true }
--        Property { name: "running"; type: "bool"; isReadonly: true }
--        Property { name: "recent"; type: "bool"; isReadonly: true }
--        Property { name: "progress"; type: "int"; isReadonly: true }
--        Property { name: "count"; type: "int"; isReadonly: true }
--        Property { name: "countVisible"; type: "bool"; isReadonly: true }
--        Property { name: "focused"; type: "bool"; isReadonly: true }
--        Property {
--            name: "quickList"
--            type: "unity::shell::launcher::QuickListModelInterface"
--            isReadonly: true
--            isPointer: true
--        }
--        Signal {
--            name: "nameChanged"
--            Parameter { name: "name"; type: "string" }
--        }
--        Signal {
--            name: "iconChanged"
--            Parameter { name: "icon"; type: "string" }
--        }
--        Signal {
--            name: "pinnedChanged"
--            Parameter { name: "pinned"; type: "bool" }
--        }
--        Signal {
--            name: "runningChanged"
--            Parameter { name: "running"; type: "bool" }
--        }
--        Signal {
--            name: "recentChanged"
--            Parameter { name: "running"; type: "bool" }
--        }
--        Signal {
--            name: "progressChanged"
--            Parameter { name: "progress"; type: "int" }
--        }
--        Signal {
--            name: "countChanged"
--            Parameter { name: "count"; type: "int" }
--        }
--        Signal {
--            name: "countVisibleChanged"
--            Parameter { name: "countVisible"; type: "bool" }
--        }
--        Signal {
--            name: "focusedChanged"
--            Parameter { name: "focused"; type: "bool" }
--        }
--    }
--    Component {
--        name: "unity::shell::launcher::LauncherModelInterface"
--        prototype: "QAbstractListModel"
--        exports: ["Unity.Launcher/LauncherModelInterface 0.1"]
--        isCreatable: false
--        exportMetaObjectRevisions: [0]
--        Property {
--            name: "applicationManager"
--            type: "unity::shell::application::ApplicationManagerInterface"
--            isPointer: true
--        }
--        Property { name: "onlyPinned"; type: "bool" }
--        Signal { name: "hint" }
--        Method {
--            name: "move"
--            Parameter { name: "oldIndex"; type: "int" }
--            Parameter { name: "newIndex"; type: "int" }
--        }
--        Method {
--            name: "get"
--            type: "unity::shell::launcher::LauncherItemInterface*"
--            Parameter { name: "index"; type: "int" }
--        }
--        Method {
--            name: "pin"
--            Parameter { name: "appId"; type: "string" }
--            Parameter { name: "index"; type: "int" }
--        }
--        Method {
--            name: "pin"
--            Parameter { name: "appId"; type: "string" }
--        }
--        Method {
--            name: "requestRemove"
--            Parameter { name: "appId"; type: "string" }
--        }
--        Method {
--            name: "quickListActionInvoked"
--            Parameter { name: "appId"; type: "string" }
--            Parameter { name: "actionIndex"; type: "int" }
--        }
--        Method {
--            name: "setUser"
--            Parameter { name: "username"; type: "string" }
--        }
--    }
--    Component {
--        name: "unity::shell::launcher::QuickListModelInterface"
--        prototype: "QAbstractListModel"
--        exports: ["Unity.Launcher/QuickListInterface 0.1"]
--        isCreatable: false
--        exportMetaObjectRevisions: [0]
--    }
--}
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2016-03-09 12:34:09 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2016-06-06 14:13:23 +0000
@@ -35,6 +35,7 @@
      m_countVisible(false),
      m_focused(false),
      m_alerting(false),
++    m_surfaceCount(0),
      m_quickList(new QuickListModel(this))
+ {
      Q_ASSERT(parent != nullptr);
@@ -213,6 +214,19 @@
+     }
+ }
++int LauncherItem::surfaceCount() const
++{
++    return m_surfaceCount;
++}
++
++void LauncherItem::setSurfaceCount(int surfaceCount)
++{
++    if (m_surfaceCount != surfaceCount) {
++        m_surfaceCount = surfaceCount;
++        Q_EMIT surfaceCountChanged(surfaceCount);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'plugins/Unity/Launcher/launcheritem.h'
 --- plugins/Unity/Launcher/launcheritem.h	2016-03-10 13:07:01 +0000
 +++ plugins/Unity/Launcher/launcheritem.h	2016-06-06 14:13:23 +0000
@@ -45,6 +45,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    int surfaceCount() const override;
      unity::shell::launcher::QuickListModelInterface *quickList() const override;
@@ -59,6 +60,7 @@
      void setCountVisible(bool countVisible);
      void setFocused(bool focused);
      void setAlerting(bool alerting);
++    void setSurfaceCount(int surfaceCount);
  private:
      QString m_appId;
@@ -72,6 +74,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    int m_surfaceCount;
      QuickListModel *m_quickList;
      QuickListEntry m_quitAction;
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2016-03-10 13:07:01 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2016-06-06 14:13:23 +0000
@@ -25,6 +25,7 @@
  #include "asadapter.h"
  #include <unity/shell/application/ApplicationInfoInterface.h>
++#include <unity/shell/application/MirSurfaceListInterface.h>
  #include <QDesktopServices>
  #include <QDebug>
@@ -88,6 +89,8 @@
              return item->alerting();
          case RoleRunning:
              return item->running();
++        case RoleSurfaceCount:
++            return item->surfaceCount();
          default:
              qWarning() << Q_FUNC_INFO << "missing role, implement me";
              return QVariant();
@@ -525,28 +528,50 @@
              item->setRecent(true);
              Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRecent});
+         }
++        if (item->surfaceCount() != app->surfaceCount()) {
++            item->setSurfaceCount(app->surfaceCount());
++            Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleSurfaceCount});
++        }
++
          item->setRunning(true);
      } else {
          LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
          item->setRecent(true);
          item->setRunning(true);
          item->setFocused(app->focused());
--
++        item->setSurfaceCount(app->surfaceCount());
          beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
          m_list.append(item);
          endInsertRows();
+     }
++    connect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);
      m_asAdapter->syncItems(m_list);
      Q_EMIT dataChanged(index(itemIndex), index(itemIndex), {RoleRunning});
+ }
++void LauncherModel::applicationSurfaceCountChanged(int count)
++{
++    ApplicationInfoInterface *app = static_cast<ApplicationInfoInterface*>(sender());
++    int idx = findApplication(app->appId());
++    if (idx < 0) {
++        qWarning() << "Received a surface count changed event from an app that's not in the Launcher model";
++        return;
++    }
++    LauncherItem *item = m_list.at(idx);
++    if (item->surfaceCount() != count) {
++        item->setSurfaceCount(count);
++        Q_EMIT dataChanged(index(idx), index(idx), {RoleSurfaceCount});
++    }
++}
++
  void LauncherModel::applicationRemoved(const QModelIndex &parent, int row)
+ {
      Q_UNUSED(parent)
++    ApplicationInfoInterface *app = m_appManager->get(row);
      int appIndex = -1;
      for (int i = 0; i < m_list.count(); ++i) {
--        if (m_list.at(i)->appId() == m_appManager->get(row)->appId()) {
++        if (m_list.at(i)->appId() == app->appId()) {
              appIndex = i;
              break;
+         }
@@ -557,6 +582,8 @@
          return;
+     }
++    disconnect(app, &ApplicationInfoInterface::surfaceCountChanged, this, &LauncherModel::applicationSurfaceCountChanged);
++
      LauncherItem * item = m_list.at(appIndex);
      item->setRunning(false);
 === modified file 'plugins/Unity/Launcher/launchermodel.h'
 --- plugins/Unity/Launcher/launchermodel.h	2016-03-01 15:24:11 +0000
 +++ plugins/Unity/Launcher/launchermodel.h	2016-06-06 14:13:23 +0000
@@ -79,6 +79,7 @@
      void applicationAdded(const QModelIndex &parent, int row);
      void applicationRemoved(const QModelIndex &parent, int row);
      void focusedAppIdChanged();
++    void applicationSurfaceCountChanged(int);
  private:
      QList<LauncherItem*> m_list;
 === modified file 'qml/Launcher/LauncherDelegate.qml'
 --- qml/Launcher/LauncherDelegate.qml	2016-05-17 20:46:51 +0000
 +++ qml/Launcher/LauncherDelegate.qml	2016-06-06 14:13:23 +0000
@@ -32,6 +32,7 @@
      property bool alerting: false
      property bool highlighted: false
      property bool shortcutHintShown: false
++    property int surfaceCount: 1
      readonly property int effectiveHeight: Math.cos(angle * Math.PI / 180) * itemHeight
      readonly property real foldedHeight: Math.cos(maxAngle * Math.PI / 180) * itemHeight
@@ -221,7 +222,8 @@
+             }
              spacing: units.gu(.5)
              Repeater {
--                model: 1 // TODO: This should be "Math.min(3, app.surfaceCount)" once we have multiple surfaces
++                objectName: "surfacePipRepeater"
++                model: Math.min(3, root.surfaceCount)
                  Rectangle {
                      objectName: "runningHighlight" + index
                      width: units.gu(0.25)
 === modified file 'qml/Launcher/LauncherPanel.qml'
 --- qml/Launcher/LauncherPanel.qml	2016-04-27 15:01:10 +0000
 +++ qml/Launcher/LauncherPanel.qml	2016-06-06 14:13:23 +0000
@@ -239,6 +239,7 @@
                          alerting: model.alerting
                          highlighted: root.highlightIndex == index
                          shortcutHintShown: root.shortcutHintsShown && index <= 9
++                        surfaceCount: model.surfaceCount
                          z: -Math.abs(offset)
                          maxAngle: 55
                          property bool dragging: false
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
 --- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-05-17 19:59:44 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-06-06 14:13:23 +0000
@@ -55,8 +55,10 @@
  ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
      : ApplicationInfoInterface(appId, parent)
      , m_appId(appId)
++    , m_surfaceList(new MirSurfaceListModel(this))
++    , m_promptSurfaceList(new MirSurfaceListModel(this))
+ {
--    connect(&m_surfaceList, &MirSurfaceListModel::countChanged,
++    connect(m_surfaceList, &MirSurfaceListModel::countChanged,
          this, &ApplicationInfo::onSurfaceCountChanged, Qt::QueuedConnection);
      m_surfaceCreationTimer.setSingleShot(true);
@@ -78,8 +80,8 @@
      if (state() == ApplicationInfo::Stopped) { return; }
      QString surfaceName = name();
--    if (m_surfaceList.count() > 0) {
--        surfaceName.append(QString(" %1").arg(m_surfaceList.count()+1));
++    if (m_surfaceList->count() > 0) {
++        surfaceName.append(QString(" %1").arg(m_surfaceList->count()+1));
+     }
      auto surfaceManager = SurfaceManager::instance();
@@ -95,7 +97,7 @@
      surface->setShellChrome(m_shellChrome);
--    m_surfaceList.appendSurface(surface);
++    m_surfaceList->appendSurface(surface);
      ++m_liveSurfaceCount;
      connect(surface, &MirSurface::liveChanged, this, [this, surface](){
@@ -186,16 +188,16 @@
      if (value != m_state) {
          DEBUG_MSG(qPrintable(stateToStr(value)));
          if (!m_manualSurfaceCreation && value == ApplicationInfo::Starting) {
--            Q_ASSERT(m_surfaceList.count() == 0);
++            Q_ASSERT(m_surfaceList->count() == 0);
              m_surfaceCreationTimer.start();
          } else if (value == ApplicationInfo::Stopped) {
              m_surfaceCreationTimer.stop();
--            for (int i = 0; i < m_surfaceList.count(); ++i) {
--                MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
++            for (int i = 0; i < m_surfaceList->count(); ++i) {
++                MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
                  surface->setLive(false);
+             }
--            for (int i = 0; i < m_promptSurfaceList.count(); ++i) {
--                auto surface = static_cast<MirSurface*>(m_promptSurfaceList.get(i));
++            for (int i = 0; i < m_promptSurfaceList->count(); ++i) {
++                auto surface = static_cast<MirSurface*>(m_promptSurfaceList->get(i));
                  surface->setLive(false);
+             }
+         }
@@ -209,9 +211,9 @@
+ {
      DEBUG_MSG("");
--    if (m_surfaceList.count() > 0) {
--        for (int i = 0; i < m_surfaceList.count(); ++i) {
--            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
++    if (m_surfaceList->count() > 0) {
++        for (int i = 0; i < m_surfaceList->count(); ++i) {
++            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
              surface->close();
+         }
      } else {
@@ -223,15 +225,15 @@
  void ApplicationInfo::setFullscreen(bool value)
+ {
      m_fullscreen = value;
--    if (m_surfaceList.rowCount() > 0) {
--        m_surfaceList.get(0)->setState(Mir::FullscreenState);
++    if (m_surfaceList->rowCount() > 0) {
++        m_surfaceList->get(0)->setState(Mir::FullscreenState);
+     }
+ }
  bool ApplicationInfo::fullscreen() const
+ {
--    if (m_surfaceList.rowCount() > 0) {
--        return m_surfaceList.get(0)->state() == Mir::FullscreenState;
++    if (m_surfaceList->rowCount() > 0) {
++        return m_surfaceList->get(0)->state() == Mir::FullscreenState;
      } else {
          return m_fullscreen;
+     }
@@ -341,16 +343,16 @@
  void ApplicationInfo::setShellChrome(Mir::ShellChrome shellChrome)
+ {
      m_shellChrome = shellChrome;
--    if (m_surfaceList.rowCount() > 0) {
--        static_cast<MirSurface*>(m_surfaceList.get(0))->setShellChrome(shellChrome);
++    if (m_surfaceList->rowCount() > 0) {
++        static_cast<MirSurface*>(m_surfaceList->get(0))->setShellChrome(shellChrome);
+     }
+ }
  bool ApplicationInfo::focused() const
+ {
      bool someSurfaceHasFocus = false; // to be proven wrong
--    for (int i = 0; i < m_surfaceList.count() && !someSurfaceHasFocus; ++i) {
--        someSurfaceHasFocus = m_surfaceList.get(i)->focused();
++    for (int i = 0; i < m_surfaceList->count() && !someSurfaceHasFocus; ++i) {
++        someSurfaceHasFocus = m_surfaceList->get(i)->focused();
+     }
      return someSurfaceHasFocus;
+ }
@@ -362,12 +364,12 @@
+     }
      if (value) {
--        if (m_surfaceList.count() > 0) {
--            m_surfaceList.get(0)->requestFocus();
++        if (m_surfaceList->count() > 0) {
++            m_surfaceList->get(0)->requestFocus();
+         }
      } else {
--        for (int i = 0; i < m_surfaceList.count(); ++i) {
--            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList.get(i));
++        for (int i = 0; i < m_surfaceList->count(); ++i) {
++            MirSurface *surface = static_cast<MirSurface*>(m_surfaceList->get(i));
              if (surface->focused()) {
                  surface->setFocused(false);
+             }
@@ -377,16 +379,16 @@
  void ApplicationInfo::onSurfaceCountChanged()
+ {
--    if (m_surfaceList.count() == 0 && m_state == Running) {
++    if (m_surfaceList->count() == 0 && m_state == Running) {
          setState(Stopped);
+     }
+ }
  void ApplicationInfo::requestFocus()
+ {
--    if (m_surfaceList.count() == 0) {
++    if (m_surfaceList->count() == 0) {
          Q_EMIT focusRequested();
      } else {
--        m_surfaceList.get(0)->requestFocus();
++        m_surfaceList->get(0)->requestFocus();
+     }
+ }
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2016-05-27 13:52:52 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-06-06 14:13:23 +0000
@@ -107,8 +107,9 @@
      Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
--    MirSurfaceListInterface* surfaceList() override { return &m_surfaceList; }
--    MirSurfaceListInterface* promptSurfaceList() override { return &m_promptSurfaceList; }
++    MirSurfaceListInterface* surfaceList() const override { return m_surfaceList; }
++    MirSurfaceListInterface* promptSurfaceList() const override { return m_promptSurfaceList; }
++    int surfaceCount() const override { return m_surfaceList->count(); }
      void setFocused(bool value);
@@ -148,8 +149,8 @@
      bool m_isTouchApp{true};
      bool m_exemptFromLifecycle{false};
      QSize m_initialSurfaceSize;
--    MirSurfaceListModel m_surfaceList;
--    MirSurfaceListModel m_promptSurfaceList;
++    MirSurfaceListModel *m_surfaceList;
++    MirSurfaceListModel *m_promptSurfaceList;
      int m_liveSurfaceCount{0};
      QTimer m_surfaceCreationTimer;
      QList<MirSurface*> m_closingSurfaces;
 === modified file 'tests/mocks/Unity/Application/MirSurfaceListModel.cpp'
 --- tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-06-06 14:13:22 +0000
 +++ tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-06-06 14:13:23 +0000
@@ -66,7 +66,7 @@
      m_surfaceList.append(surface);
      connectSurface(surface);
      endInsertRows();
--    Q_EMIT countChanged();
++    Q_EMIT countChanged(m_surfaceList.count());
      if (m_surfaceList.count() == 1) {
          Q_EMIT firstChanged();
+     }
@@ -78,7 +78,7 @@
      m_surfaceList.prepend(surface);
      connectSurface(surface);
      endInsertRows();
--    Q_EMIT countChanged();
++    Q_EMIT countChanged(m_surfaceList.count());
      Q_EMIT firstChanged();
+ }
@@ -95,7 +95,7 @@
          beginRemoveRows(QModelIndex(), i, i);
          m_surfaceList.removeAt(i);
          endRemoveRows();
--        Q_EMIT countChanged();
++        Q_EMIT countChanged(m_surfaceList.count());
          if (m_surfaceList.count() == 0 || i == 0) {
              Q_EMIT firstChanged();
+         }
 === modified file 'tests/mocks/Unity/Launcher/CMakeLists.txt'
 --- tests/mocks/Unity/Launcher/CMakeLists.txt	2015-07-23 10:31:56 +0000
 +++ tests/mocks/Unity/Launcher/CMakeLists.txt	2016-06-06 14:13:23 +0000
@@ -1,4 +1,4 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-11-23 15:41:34 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2016-06-06 14:13:23 +0000
@@ -38,6 +38,7 @@
      m_countVisible(false),
      m_focused(false),
      m_alerting(false),
++    m_surfaceCount(0),
      m_quickList(new MockQuickListModel(this))
+ {
+ }
@@ -182,6 +183,19 @@
+     }
+ }
++int MockLauncherItem::surfaceCount() const
++{
++    return m_surfaceCount;
++}
++
++void MockLauncherItem::setSurfaceCount(int surfaceCount)
++{
++    if (m_surfaceCount != surfaceCount) {
++        m_surfaceCount = surfaceCount;
++        Q_EMIT surfaceCountChanged(surfaceCount);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *MockLauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.h'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.h	2015-07-23 14:13:57 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.h	2016-06-06 14:13:23 +0000
@@ -46,6 +46,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    int surfaceCount() const override;
      unity::shell::launcher::QuickListModelInterface *quickList() const override;
@@ -58,6 +59,7 @@
      void setCountVisible(bool countVisible);
      void setFocused(bool focused);
      void setAlerting(bool alerting);
++    void setSurfaceCount(int surfaceCount);
      QString m_appId;
      QString m_desktopFile;
@@ -71,6 +73,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    int m_surfaceCount;
      MockQuickListModel *m_quickList;
      friend class MockLauncherModel;
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-11-25 10:35:29 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2016-06-06 14:13:23 +0000
@@ -25,6 +25,7 @@
      MockLauncherItem *item = new MockLauncherItem("dialer-app", "/usr/share/applications/dialer-app.desktop", "Dialer", "dialer-app", this);
      item->setProgress(0);
      item->setPinned(true);
++    item->setSurfaceCount(1);
      item->setRunning(true);
      item->setFocused(true);
      m_list.append(item);
@@ -36,6 +37,7 @@
      item->setProgress(50);
      item->setCountVisible(true);
      item->setRunning(true);
++    item->setSurfaceCount(2);
      item->setAlerting(false);
      m_list.append(item);
      item = new MockLauncherItem("music-app", "/usr/share/applications/music-app.desktop", "Music", "soundcloud", this);
@@ -44,6 +46,7 @@
      item->setProgress(150);
      m_list.append(item);
      item = new MockLauncherItem("webbrowser-app", "/usr/share/applications/webbrowser-app.desktop", "Browser", "browser", this);
++    item->setSurfaceCount(5);
      item->setCount(1);
      item->setCountVisible(true);
      item->setRunning(true);
@@ -119,6 +122,8 @@
          return item->focused();
      case RoleAlerting:
          return item->alerting();
++    case RoleSurfaceCount:
++        return item->surfaceCount();
+     }
      return QVariant();
 === modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Unity/Launcher/CMakeLists.txt	2016-04-19 20:36:29 +0000
 +++ tests/plugins/Unity/Launcher/CMakeLists.txt	2016-06-06 14:13:23 +0000
@@ -1,5 +1,5 @@
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-05-17 19:25:23 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-06-06 14:13:23 +0000
@@ -66,14 +66,17 @@
      void setExemptFromLifecycle(bool) override {}
      QSize initialSurfaceSize() const override { return QSize(); }
      void setInitialSurfaceSize(const QSize &) override {}
--    MirSurfaceListInterface* surfaceList() override { return nullptr; }
--    MirSurfaceListInterface* promptSurfaceList() override { return nullptr; }
++    MirSurfaceListInterface* surfaceList() const override { return nullptr; }
++    MirSurfaceListInterface* promptSurfaceList() const override { return nullptr; }
++    int surfaceCount() const override { return m_surfaceCount; }
++    void setSurfaceCount(int count) { m_surfaceCount = count; Q_EMIT surfaceCountChanged(count); }
      // Methods used for mocking (not in the interface)
      void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
  private:
      QString m_appId;
      bool m_focused;
++    int m_surfaceCount = 0;
  };
  // This is a mock, specifically to test the LauncherModel
@@ -692,6 +695,15 @@
          QCOMPARE(getASConfig().at(index).value("countVisible").toBool(), true);
          QCOMPARE(getASConfig().at(index).value("count").toInt(), 55);
+     }
++
++    void testSurfaceCountUpdates() {
++        QString appId = launcherModel->get(0)->appId();
++
++        QCOMPARE(launcherModel->get(0)->surfaceCount(), 0);
++        MockApp *app = qobject_cast<MockApp*>(appManager->findApplication(appId));
++        app->setSurfaceCount(1);
++        QCOMPARE(launcherModel->get(0)->surfaceCount(), 1);
++    }
  };
  QTEST_GUILESS_MAIN(LauncherModelTest)
 === modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
 --- tests/qmltests/Launcher/tst_Launcher.qml	2016-05-27 13:53:41 +0000
 +++ tests/qmltests/Launcher/tst_Launcher.qml	2016-06-06 14:13:23 +0000
@@ -486,25 +486,26 @@
          function test_progressOverlays() {
              dragLauncherIntoView();
              var launcherListView = findChild(launcher, "launcherListView");
++            var moveAnimation = findInvisibleChild(launcherListView, "moveAnimation")
              for (var i = 0; i < launcherListView.count; ++i) {
++                launcherListView.moveToIndex(i);
++                waitForRendering(launcherListView);
++                tryCompare(moveAnimation, "running", false);
++
                  var delegate = findChild(launcherListView, "launcherDelegate" + i)
                  compare(findChild(delegate, "progressOverlay").visible, LauncherModel.get(i).progress >= 0)
+             }
+         }
--        function test_runningHighlight() {
--            dragLauncherIntoView();
--            var launcherListView = findChild(launcher, "launcherListView");
--            for (var i = 0; i < launcherListView.count; ++i) {
--                var delegate = findChild(launcherListView, "launcherDelegate" + i)
--                compare(findChild(delegate, "runningHighlight0").visible, LauncherModel.get(i).running)
--            }
--        }
--
          function test_focusedHighlight() {
              dragLauncherIntoView();
              var launcherListView = findChild(launcher, "launcherListView");
++            var moveAnimation = findInvisibleChild(launcherListView, "moveAnimation")
++
              for (var i = 0; i < launcherListView.count; ++i) {
++                launcherListView.moveToIndex(i);
++                waitForRendering(launcherListView);
++                tryCompare(moveAnimation, "running", false);
                  var delegate = findChild(launcherListView, "launcherDelegate" + i)
                  compare(findChild(delegate, "focusedHighlight").visible, LauncherModel.get(i).focused)
+             }
@@ -1295,5 +1296,20 @@
              assertFocusOnIndex(-2);
+         }
++
++        function test_surfaceCountPips() {
++            var launcherListView = findChild(launcher, "launcherListView")
++            var moveAnimation = findInvisibleChild(launcherListView, "moveAnimation")
++
++            for (var i = 0; i < launcherListView.count; i++) {
++                launcherListView.moveToIndex(i);
++                waitForRendering(launcherListView);
++                tryCompare(moveAnimation, "running", false);
++
++                var delegate = findChild(launcher, "launcherDelegate" + i);
++                var surfacePipRepeater = findInvisibleChild(delegate, "surfacePipRepeater");
++                compare(surfacePipRepeater.model, Math.min(3, LauncherModel.get(i).surfaceCount))
++            }
++        }
+     }
+ }