Merge lp:~mzanetti/unity8/alerting-pips into lp:unity8

[Michael Zanetti]

Add support for the persistent alert state.

Paint pips blue when an app is in alert state

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

yes, listing them in a minute

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

yes, change requested by design. This reveals an issue in the design spec. Here's my conversation with John:

<mzanetti> I have a small issue with the persistent alert state
 we are currently coloring pips blue. Problem is, if the app is not running and the alert happened because of a push notification, there is no pip which could be blue
 the count emblem will still be there though
<JohnLea> humm, yes this is a small problem
 I think it is ok for the moment, but a better solution could be to use something else as the persistent alert notification
<mzanetti> you tell me: a) ignore the problem or b) force a pip even if no surface
<JohnLea> for now do a)
<mzanetti> ack
<JohnLea> in the mean time I'll speak to Matthieu and ask him to have a look at other options, perhaps indicating something on the app icon itself
 but that's for the future

[Michael Zanetti (mzanetti)]

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

yes, listing them in a minute

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

yes, change requested by design. This reveals an issue in the design spec. Here's my conversation with John:

<mzanetti> I have a small issue with the persistent alert state
 we are currently coloring pips blue. Problem is, if the app is not running and the alert happened because of a push notification, there is no pip which could be blue
 the count emblem will still be there though
<JohnLea> humm, yes this is a small problem
 I think it is ok for the moment, but a better solution could be to use something else as the persistent alert notification
<mzanetti> you tell me: a) ignore the problem or b) force a pip even if no surface
<JohnLea> for now do a)
<mzanetti> ack
<JohnLea> in the mean time I'll speak to Matthieu and ask him to have a look at other options, perhaps indicating something on the app icon itself
 but that's for the future

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

FAILED: Continuous integration, rev:2400
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1214/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1629
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1583
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1583
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1576/console

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/unity8/alerting-pips]

2401. By Michael Zanetti on 2016-05-13

cleanup

2402. By Michael Zanetti on 2016-05-13

fixes

2403. By Michael Zanetti on 2016-05-13

fixes

2404. By Michael Zanetti on 2016-05-13

fix tests

2405. By Michael Zanetti on 2016-05-13

fix usage of color vs palette

2406. By Michael Zanetti on 2016-05-18

test if the alert is properly cleared on focus

2407. By Michael Zanetti on 2016-05-19

merge prereq

2408. By Michael Zanetti on 2016-06-03

merge prereq, bump unity-api version requirement

2409. By Michael Zanetti on 2016-06-03

bump package requirement once more

2410. By Michael Zanetti on 2016-06-03

that wasn't necessary

2411. By Michael Zanetti on 2016-06-03

merge prereq

2412. By Michael Zanetti on 2016-06-06

merge prereq

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-27 15:01:10 +0000
+++ CMakeLists.txt	2016-05-13 11:17:06 +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=15)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=16)
 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-04 18:09:25 +0000
+++ debian/control	2016-05-13 11:17:06 +0000
@@ -30,7 +30,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.111),
+               libunity-api-dev (>= 7.112),
                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-05-13 11:17:06 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
 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-05-13 11:17:06 +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-05-13 11:17:06 +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-05-13 11:17:06 +0000
@@ -69,18 +69,13 @@
             return item->focused();
         case RoleRunning:
             return item->running();
+        case RoleSurfaceCount:
+            return item->surfaceCount();
     }
 
     return QVariant();
 }
 
-void LauncherModel::setAlerting(const QString &appId, bool alerting)
-{
-    Q_UNUSED(appId)
-    Q_UNUSED(alerting)
-    qWarning() << "This is a read only implementation. Cannot set alert-state of items.";
-}
-
 unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
 {
     if (index < 0 || index >= m_list.count()) {

=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.h'
--- plugins/Greeter/Unity/Launcher/launchermodelas.h	2015-10-26 14:05:14 +0000
+++ plugins/Greeter/Unity/Launcher/launchermodelas.h	2016-05-13 11:17:06 +0000
@@ -41,7 +41,6 @@
 
     QVariant data(const QModelIndex &index, int role) const override;
 
-    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

=== 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-05-13 11:17:06 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
 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-05-13 11:17:06 +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);
@@ -162,9 +163,6 @@
     if (m_count != count) {
         m_count = count;
         Q_EMIT countChanged(count);
-        if (m_countVisible) {
-            setAlerting(true);
-        }
     }
 }
 
@@ -178,9 +176,6 @@
     if (m_countVisible != countVisible) {
         m_countVisible = countVisible;
         Q_EMIT countVisibleChanged(countVisible);
-        if (countVisible) {
-            setAlerting(true);
-        }
     }
 }
 
@@ -193,9 +188,6 @@
 {
     if (m_focused != focused) {
         m_focused = focused;
-        if (focused) {
-            setAlerting(false);
-        }
         Q_EMIT focusedChanged(focused);
     }
 }
@@ -213,6 +205,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-05-13 11:17:06 +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-05-13 11:17:06 +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();
@@ -96,18 +99,6 @@
     return QVariant();
 }
 
-void LauncherModel::setAlerting(const QString &appId, bool alerting) {
-    int index = findApplication(appId);
-    if (index >= 0) {
-        QModelIndex modelIndex = this->index(index);
-        LauncherItem *item = m_list.at(index);
-        if (!item->focused()) {
-            item->setAlerting(alerting);
-            Q_EMIT dataChanged(modelIndex, modelIndex, {RoleAlerting});
-        }
-    }
-}
-
 unity::shell::launcher::LauncherItemInterface *LauncherModel::get(int index) const
 {
     if (index < 0 || index >= m_list.count()) {
@@ -358,11 +349,13 @@
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCount(count);
-        if (item->countVisible()) {
-            setAlerting(item->appId(), true);
+        QVector<int> changedRoles = {RoleCount};
+        if (item->countVisible() && !item->alerting() && !item->focused()) {
+            changedRoles << RoleAlerting;
+            item->setAlerting(true);
         }
         m_asAdapter->syncItems(m_list);
-        Q_EMIT dataChanged(index(idx), index(idx), {RoleCount});
+        Q_EMIT dataChanged(index(idx), index(idx), changedRoles);
     }
 }
 
@@ -372,10 +365,12 @@
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
         item->setCountVisible(countVisible);
-        if (countVisible) {
-            setAlerting(item->appId(), true);
+        QVector<int> changedRoles = {RoleCount};
+        if (countVisible && !item->alerting() && !item->focused()) {
+            changedRoles << RoleAlerting;
+            item->setAlerting(true);
         }
-        Q_EMIT dataChanged(index(idx), index(idx), {RoleCountVisible});
+        Q_EMIT dataChanged(index(idx), index(idx), changedRoles);
 
         // If countVisible goes to false, and the item is neither pinned nor recent we can drop it
         if (!countVisible && !item->pinned() && !item->recent()) {
@@ -495,10 +490,12 @@
 
 void LauncherModel::alert(const QString &appId)
 {
+    qDebug() << "alerting for appId" << appId;
     int idx = findApplication(appId);
     if (idx >= 0) {
         LauncherItem *item = m_list.at(idx);
-        setAlerting(item->appId(), true);
+        if (!item->focused() && !item->alerting())
+        item->setAlerting(true);
         Q_EMIT dataChanged(index(idx), index(idx), {RoleAlerting});
     }
 }
@@ -525,21 +522,42 @@
             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)
@@ -576,8 +594,14 @@
     for (int i = 0; i < m_list.count(); ++i) {
         LauncherItem *item = m_list.at(i);
         if (!item->focused() && item->appId() == appId) {
+            QVector<int> changedRoles;
+            changedRoles << RoleFocused;
             item->setFocused(true);
-            Q_EMIT dataChanged(index(i), index(i), {RoleFocused});
+            if (item->alerting()) {
+                changedRoles << RoleAlerting;
+                item->setAlerting(false);
+            }
+            Q_EMIT dataChanged(index(i), index(i), changedRoles);
         } else if (item->focused() && item->appId() != appId) {
             item->setFocused(false);
             Q_EMIT dataChanged(index(i), index(i), {RoleFocused});

=== 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-05-13 11:17:06 +0000
@@ -45,7 +45,6 @@
 
     QVariant data(const QModelIndex &index, int role) const override;
 
-    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface* get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;
@@ -79,6 +78,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-03-29 13:51:56 +0000
+++ qml/Launcher/LauncherDelegate.qml	2016-05-13 11:17:06 +0000
@@ -32,11 +32,16 @@
     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
     readonly property alias wiggling: wiggleAnim.running
 
+    onAlertingChanged: {
+        print("item", index, "alerting:", alerting)
+    }
+
     property int itemWidth
     property int itemHeight
     // The angle used for rotating
@@ -114,12 +119,6 @@
             duration: priv.wiggleDuration
             easing.type: Easing.OutQuad
         }
-
-        UbuntuNumberAnimation {
-            target: root
-            property: "alerting"
-            to: 0
-        }
     }
 
     Item {
@@ -221,12 +220,13 @@
             }
             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)
                     height: units.gu(.5)
-                    color: "white"
+                    color: root.alerting ? UbuntuColors.blue : "white"
                     visible: root.itemRunning
                 }
             }

=== modified file 'qml/Launcher/LauncherPanel.qml'
--- qml/Launcher/LauncherPanel.qml	2016-04-27 15:01:10 +0000
+++ qml/Launcher/LauncherPanel.qml	2016-05-13 11:17:06 +0000
@@ -239,10 +239,20 @@
                         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
 
+                        Timer {
+                            interval: 1000
+                            running: index == 2
+                            repeat: true
+                            onTriggered: {
+                                print("is alerting", model.alerting)
+                            }
+                        }
+
                         SequentialAnimation {
                             id: peekingAnimation
 
@@ -274,6 +284,7 @@
                         }
 
                         onAlertingChanged: {
+                            print("panel alerting changed", alerting)
                             if(alerting) {
                                 if (!dragging && (launcherListView.peekingIndex === -1 || launcher.visibleWidth > 0)) {
                                     launcherListView.moveToIndex(index)

=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-04-27 15:01:10 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-05-13 11:17:06 +0000
@@ -55,8 +55,9 @@
 ApplicationInfo::ApplicationInfo(const QString &appId, QObject *parent)
     : ApplicationInfoInterface(appId, parent)
     , m_appId(appId)
+    , m_surfaceList(new MirSurfaceListModel(this))
 {
-    connect(&m_surfaceList, &MirSurfaceListModel::countChanged,
+    connect(m_surfaceList, &MirSurfaceListModel::countChanged,
         this, &ApplicationInfo::onSurfaceCountChanged, Qt::QueuedConnection);
 
     m_surfaceCreationTimer.setSingleShot(true);
@@ -78,8 +79,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 +96,7 @@
 
     surface->setShellChrome(m_shellChrome);
 
-    m_surfaceList.appendSurface(surface);
+    m_surfaceList->appendSurface(surface);
 
     ++m_liveSurfaceCount;
     connect(surface, &MirSurface::liveChanged, this, [this, surface](){
@@ -186,12 +187,12 @@
     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);
             }
         }
@@ -205,9 +206,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 {
@@ -219,15 +220,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;
     }
@@ -333,16 +334,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;
 }
@@ -354,12 +355,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);
             }
@@ -369,16 +370,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-04-27 15:01:10 +0000
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-05-13 11:17:06 +0000
@@ -107,7 +107,8 @@
 
     Q_INVOKABLE void setShellChrome(Mir::ShellChrome shellChrome);
 
-    MirSurfaceListInterface* surfaceList() override { return &m_surfaceList; }
+    MirSurfaceListInterface* surfaceList() const override { return m_surfaceList; }
+    int surfaceCount() const override { return m_surfaceList->count(); }
 
     void setFocused(bool value);
 
@@ -147,7 +148,7 @@
     bool m_isTouchApp{true};
     bool m_exemptFromLifecycle{false};
     QSize m_initialSurfaceSize;
-    MirSurfaceListModel m_surfaceList;
+    MirSurfaceListModel *m_surfaceList;
     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-04-04 13:37:49 +0000
+++ tests/mocks/Unity/Application/MirSurfaceListModel.cpp	2016-05-13 11:17:06 +0000
@@ -66,7 +66,7 @@
     m_surfaceList.append(surface);
     connectSurface(surface);
     endInsertRows();
-    Q_EMIT countChanged();
+    Q_EMIT countChanged(m_surfaceList.count());
 }
 
 void MirSurfaceListModel::connectSurface(MirSurface *surface)
@@ -82,7 +82,7 @@
         beginRemoveRows(QModelIndex(), i, i);
         m_surfaceList.removeAt(i);
         endRemoveRows();
-        Q_EMIT countChanged();
+        Q_EMIT countChanged(m_surfaceList.count());
     }
 }
 

=== 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-05-13 11:17:06 +0000
@@ -1,4 +1,4 @@
-pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
+pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=9)
 
 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-05-13 11:17:06 +0000
@@ -21,6 +21,7 @@
 #include "MockQuickListModel.h"
 
 #include <paths.h>
+#include <QDebug>
 
 using namespace unity::shell::launcher;
 
@@ -38,6 +39,7 @@
     m_countVisible(false),
     m_focused(false),
     m_alerting(false),
+    m_surfaceCount(0),
     m_quickList(new MockQuickListModel(this))
 {
 }
@@ -178,10 +180,24 @@
 {
     if (m_alerting != alerting) {
         m_alerting = alerting;
+        qDebug() << m_appId << "setting alerting" << alerting;
         Q_EMIT alertingChanged(alerting);
     }
 }
 
+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-05-13 11:17:06 +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-05-13 11:17:06 +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/mocks/Unity/Launcher/MockLauncherModel.h'
--- tests/mocks/Unity/Launcher/MockLauncherModel.h	2015-07-23 10:31:56 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.h	2016-05-13 11:17:06 +0000
@@ -38,7 +38,7 @@
 
     QVariant data(const QModelIndex& index, int role) const override;
 
-    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting) override;
+    Q_INVOKABLE void setAlerting(const QString &appId, bool alerting); // Only for testing
     Q_INVOKABLE unity::shell::launcher::LauncherItemInterface *get(int index) const override;
     Q_INVOKABLE void move(int oldIndex, int newIndex) override;
     Q_INVOKABLE void pin(const QString &appId, int index = -1) override;

=== 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-05-13 11:17:06 +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-04-27 15:01:10 +0000
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-05-13 11:17:06 +0000
@@ -66,13 +66,16 @@
     void setExemptFromLifecycle(bool) override {}
     QSize initialSurfaceSize() const override { return QSize(); }
     void setInitialSurfaceSize(const QSize &) override {}
-    MirSurfaceListInterface* surfaceList() override { return nullptr; }
+    MirSurfaceListInterface* surfaceList() 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
@@ -691,6 +694,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-03-29 10:43:22 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2016-05-13 11:17:06 +0000
@@ -176,7 +176,10 @@
 
             Button {
                 text: "set alert"
-                onClicked: LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)
+                onClicked: {
+                    print("should alert", LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId)
+                    LauncherModel.setAlerting(LauncherModel.get(parseInt(appIdEntryAlert.displayText)).appId, true)
+                }
             }
 
             TextArea {
@@ -478,25 +481,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)
             }
@@ -1283,5 +1287,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))
+            }
+        }
     }
 }