Unity 8

Merge lp:~mterry/unity8/warn-on-xapp into lp:unity8

warn-on-xapp
Merge into trunk

Proposed by Michael Terry on 2015-11-18

Status:	Work in progress
Proposed branch:	lp:~mterry/unity8/warn-on-xapp
Merge into:	lp:unity8
Prerequisite:	lp:~mzanetti/unity8/modeswitchwarning
Diff against target:	752 lines (+258/-45) 27 files modified CMakeLists.txt (+2/-1) debian/control (+6/-6) plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-1) plugins/Greeter/Unity/Launcher/launcheritem.cpp (+14/-0) plugins/Greeter/Unity/Launcher/launcheritem.h (+3/-0) plugins/Greeter/Unity/Launcher/launchermodelas.cpp (+10/-4) plugins/Unity/Launcher/CMakeLists.txt (+0/-1) plugins/Unity/Launcher/desktopfilehandler.cpp (+12/-0) plugins/Unity/Launcher/desktopfilehandler.h (+1/-0) plugins/Unity/Launcher/launcheritem.cpp (+14/-0) plugins/Unity/Launcher/launcheritem.h (+3/-0) plugins/Unity/Launcher/launchermodel.cpp (+30/-22) plugins/Unity/Launcher/launchermodel.h (+1/-1) qml/Components/Dialogs.qml (+26/-4) qml/Components/LegacyAppLaunchWarningDialog.qml (+51/-0) qml/Shell.qml (+9/-0) tests/mocks/Unity/Application/Application.qmltypes (+5/-0) tests/mocks/Unity/Application/ApplicationManager.cpp (+14/-0) tests/mocks/Unity/Application/ApplicationManager.h (+1/-0) tests/mocks/Unity/Launcher/CMakeLists.txt (+0/-2) tests/mocks/Unity/Launcher/MockLauncherItem.cpp (+13/-0) tests/mocks/Unity/Launcher/MockLauncherItem.h (+3/-0) tests/mocks/Unity/Launcher/MockLauncherModel.cpp (+2/-0) tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt (+0/-2) tests/plugins/Unity/Launcher/CMakeLists.txt (+0/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+3/-0) tests/qmltests/tst_Shell.qml (+35/-0)
To merge this branch:	bzr merge lp:~mterry/unity8/warn-on-xapp
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-01-13
Gerry Boland			Needs Fixing on 2016-01-07
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-12-02
Albert Astals Cid (community)	merges fine		Abstain on 2015-11-30
Michael Zanetti (community)		2015-11-18	Needs Information on 2015-11-20
Review via email: mp+277915@code.launchpad.net

Commit Message

Prevent user from launching legacy xapps when in tablet or phone mode.

Description of the Change

Prevent user from launching legacy xapps when in tablet or phone mode.

There are open design questions ("what should the text be?" and "should we make the legacy icons look different?") that I'm waiting on answers for. But this can be reviewed from a technical POV already.

Note that the LauncherItem changes to support isTouchApp aren't used yet. But they might be if Design wants a different look for them.

== Checklist ==

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~mterry/unity-api/warn-on-xapp/+merge/277922
https://code.launchpad.net/~mterry/qtmir/warn-on-xapp/+merge/279172
https://code.launchpad.net/~mterry/ubuntu-app-launch/warn-on-xapp/+merge/278497

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

* Did you make sure that your branch does not contain spurious tags?
Yes

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

* If you changed the UI, has there been a design review?
Not yet, working on it.

PS Jenkins bot (ps-jenkins) wrote on 2015-11-19:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6743/rebuild

review: Needs Fixing (continuous-integration)

Michael Zanetti (mzanetti) wrote on 2015-11-20:

As discussed on IRC, this probably won't cut it. For instance it won't prevent the dash to launch the app. also anything else can do Qt.openUrlExternally(legacyApp).

I think the proper way to go would be to extend ApplicationManager to request permission for launching an app with the shell. Let's do a hangout with Gerry regarding this today.

review: Needs Information

Albert Astals Cid (aacid) wrote on 2015-11-20:

Text conflict in tests/qmltests/tst_Shell.qml
1 conflicts encountered.

review: Needs Fixing

lp:~mterry/unity8/warn-on-xapp updated on 2015-11-20

2042. By Michael Terry on 2015-11-20: Merge from trunk

Michael Terry (mterry) wrote on 2015-11-20:

Fixed conflicts.

Albert Astals Cid (aacid) on 2015-11-20:

review: Abstain (merges fine)

PS Jenkins bot (ps-jenkins) wrote on 2015-11-20:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6754/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-11-30:

Text conflict in CMakeLists.txt
1 conflicts encountered.

review: Needs Fixing

lp:~mterry/unity8/warn-on-xapp updated on 2015-11-30

2043. By Michael Terry on 2015-11-30: Merge from trunk

PS Jenkins bot (ps-jenkins) wrote on 2015-11-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6833/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) on 2015-11-30:

review: Abstain (merges fine)

lp:~mterry/unity8/warn-on-xapp updated on 2015-12-01

2044. By Michael Terry on 2015-12-01: Update to use new approval API in ApplicationManager

PS Jenkins bot (ps-jenkins) wrote on 2015-12-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6859/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/warn-on-xapp updated on 2015-12-02

2045. By Michael Terry on 2015-12-02: Fix typo by actually specifying appId when docking

PS Jenkins bot (ps-jenkins) wrote on 2015-12-02:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6870/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2015-12-14:

Text conflict in CMakeLists.txt
1 conflicts encountered.

Gerry Boland (gerboland) wrote on 2016-01-07:

=== modified file 'plugins/Greeter/Unity/Launcher/launchermodelas.cpp'
+ case RoleAlerting:
+ return item->alerting();
Unrelated to this MP.

=== modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
Off topic (since I see it being done elsewhere in the file)

+bool DesktopFileHandler::isTouchApp() const
+{
+ if (isValid()) {
+ QSettings settings(m_filename, QSettings::IniFormat);
+ settings.setIniCodec("UTF-8");
+ settings.beginGroup(QStringLiteral("Desktop Entry"));
+ return settings.value(QStringLiteral("X-Ubuntu-Touch")).toBool(); // false for empty or "false"

Rest looks ok to me, but would prefer launcher owner have a look.
Creating the QSettings object and parse the desktop file for each property read isn't very efficient. Any idea why we don't just parse it once at DesktopFileHandler creation?

review: Needs Fixing

Michael Zanetti (mzanetti) wrote on 2016-01-07:

> +bool DesktopFileHandler::isTouchApp() const
> +{
> + if (isValid()) {
> + QSettings settings(m_filename, QSettings::IniFormat);
> + settings.setIniCodec("UTF-8");
> + settings.beginGroup(QStringLiteral("Desktop Entry"));
> + return settings.value(QStringLiteral("X-Ubuntu-Touch")).toBool(); // false
> for empty or "false"
>
> Rest looks ok to me, but would prefer launcher owner have a look.
> Creating the QSettings object and parse the desktop file for each property
> read isn't very efficient. Any idea why we don't just parse it once at
> DesktopFileHandler creation?

From the QSettings docs: "Constructing and destroying a QSettings object is very fast."

Michael Zanetti (mzanetti) wrote on 2016-01-07:

that said, parsing can be costly indeed. However, following the code around it, this is called only once when a launcher item is created. IMO we're ok here.

Michael Terry (mterry) wrote on 2016-01-07:

Regarding the QSettings, I didn't want to make any big changes because Lukas has a rewrite of that code in https://code.launchpad.net/~lukas-kde/unity8/desktopFileActions/+merge/276408 which converts to GKeyFile.

And as mzanetti said, it's one time.

Regarding the unrelated Role switch statement resortings, it's just a bit of cleanup. Everytime a property gets added to the application interface, they need to be added to a bunch of switch statements around the place. And currently, they are all in different orders, which makes it hard to tell if any are missing from one. For example, when adding RoleIsTouchApp for this MP, I noticed that launchermodelas.cpp was missing RoleRecent and RoleAlerting. So I added them here and sorted them to all be the same order, so it's less likely we'll miss future ones. So tangentially related, but not wholly unrelated.

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

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

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-01-25:

Text conflict in CMakeLists.txt
Text conflict in debian/control
2 conflicts

Unmerged revisions

2045. By Michael Terry on 2015-12-02: Fix typo by actually specifying appId when docking
2044. By Michael Terry on 2015-12-01: Update to use new approval API in ApplicationManager
2043. By Michael Terry on 2015-11-30: Merge from trunk
2042. By Michael Terry on 2015-11-20: Merge from trunk
2041. By Michael Terry on 2015-11-18: First pass at warning when launching a legacy app
2040. By Michael Terry on 2015-11-18: Merge in mzanetti's modeswitchwarning branch, we'll use a similar dialog

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 Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2015-11-26 13:51:24 +0000
 +++ CMakeLists.txt	2015-12-02 17:26:09 +0000
@@ -57,7 +57,8 @@
  find_package(Qt5Concurrent 5.4 REQUIRED)
  find_package(Qt5Sql 5.4 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=11)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)
++pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=8)
  # Standard install paths
  include(GNUInstallDirs)
 === modified file 'debian/control'
 --- debian/control	2015-11-26 13:51:24 +0000
 +++ debian/control	2015-12-02 17:26:09 +0000
@@ -29,7 +29,7 @@
                 libqt5xmlpatterns5-dev,
                 libsystemsettings-dev,
                 libudev-dev,
--               libunity-api-dev (>= 7.103),
++               libunity-api-dev (>= 7.104),
                 libusermetricsoutput1-dev,
                 libxcb1-dev,
                 pkg-config,
@@ -98,11 +98,11 @@
           qml-module-qtquick-xmllistmodel,
           qml-module-qtsysteminfo,
           qtdeclarative5-gsettings1.0,
--         qtdeclarative5-qtmir-plugin (>= 0.4.5),
++         qtdeclarative5-qtmir-plugin (>= 0.4.7),
           qtdeclarative5-ubuntu-telephony0.1,
           qtdeclarative5-ubuntu-web-plugin,
           ubuntu-system-settings,
--         unity-launcher-impl-7,
++         unity-launcher-impl-8,
           unity8-common (= ${source:Version}),
           unity8-private (= ${binary:Version}),
           unity8-private | unity-launcher-impl,
@@ -128,7 +128,7 @@
           qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
           qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
           ubuntu-thumbnailer-impl-0,
--         unity-application-impl-11,
++         unity-application-impl-12,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-7,
@@ -174,7 +174,7 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-11,
++          unity-application-impl-12,
  Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
  Description: Fake environment for running Unity 8 shell
   Provides fake implementations of some QML modules used by Unity 8 shell
@@ -192,7 +192,7 @@
           ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-launcher-impl,
--          unity-launcher-impl-7,
++          unity-launcher-impl-8,
  Description: Unity 8 private libs
   The Unity 8 shell is the primary user interface for Ubuntu devices.
+  .
 === 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	2015-12-02 17:26:09 +0000
@@ -1,4 +1,3 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
  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	2015-12-02 17:26:09 +0000
@@ -32,6 +32,7 @@
      m_countVisible(false),
      m_focused(false),
      m_alerting(false),
++    m_isTouchApp(false),
      m_quickList(new QuickListModel(this))
+ {
      QuickListEntry nameAction;
@@ -179,6 +180,19 @@
+     }
+ }
++bool LauncherItem::isTouchApp() const
++{
++    return m_isTouchApp;
++}
++
++void LauncherItem::setIsTouchApp(bool isTouchApp)
++{
++    if (m_isTouchApp != isTouchApp) {
++        m_isTouchApp = isTouchApp;
++        Q_EMIT isTouchAppChanged(isTouchApp);
++    }
++}
++
  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	2015-12-02 17:26:09 +0000
@@ -42,6 +42,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    bool isTouchApp() const override;
      unity::shell::launcher::QuickListModelInterface *quickList() const override;
@@ -56,6 +57,7 @@
      void setCountVisible(bool countVisible);
      void setFocused(bool focused);
      void setAlerting(bool alerting);
++    void setIsTouchApp(bool isTouchApp);
  private:
@@ -70,6 +72,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    bool m_isTouchApp;
      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	2015-12-02 17:26:09 +0000
@@ -59,16 +59,22 @@
              return item->icon();
          case RolePinned:
              return item->pinned();
++        case RoleRunning:
++            return item->running();
++        case RoleRecent:
++            return item->recent();
++        case RoleProgress:
++            return item->progress();
          case RoleCount:
              return item->count();
          case RoleCountVisible:
              return item->countVisible();
--        case RoleProgress:
--            return item->progress();
          case RoleFocused:
              return item->focused();
--        case RoleRunning:
--            return item->running();
++        case RoleAlerting:
++            return item->alerting();
++        case RoleIsTouchApp:
++            return item->isTouchApp();
+     }
      return QVariant();
 === modified file 'plugins/Unity/Launcher/CMakeLists.txt'
 --- plugins/Unity/Launcher/CMakeLists.txt	2015-08-03 13:47:44 +0000
 +++ plugins/Unity/Launcher/CMakeLists.txt	2015-12-02 17:26:09 +0000
@@ -1,4 +1,3 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
  add_definitions(-DSM_BUSNAME=systemBus)
 === modified file 'plugins/Unity/Launcher/desktopfilehandler.cpp'
 --- plugins/Unity/Launcher/desktopfilehandler.cpp	2015-09-30 12:43:53 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.cpp	2015-12-02 17:26:09 +0000
@@ -57,6 +57,18 @@
      return !m_filename.isEmpty();
+ }
++bool DesktopFileHandler::isTouchApp() const
++{
++    if (isValid()) {
++        QSettings settings(m_filename, QSettings::IniFormat);
++        settings.setIniCodec("UTF-8");
++        settings.beginGroup(QStringLiteral("Desktop Entry"));
++        return settings.value(QStringLiteral("X-Ubuntu-Touch")).toBool(); // false for empty or "false"
++    } else {
++        return false;
++    }
++}
++
  void DesktopFileHandler::load()
+ {
      m_filename.clear();
 === modified file 'plugins/Unity/Launcher/desktopfilehandler.h'
 --- plugins/Unity/Launcher/desktopfilehandler.h	2014-09-02 17:45:50 +0000
 +++ plugins/Unity/Launcher/desktopfilehandler.h	2015-12-02 17:26:09 +0000
@@ -42,6 +42,7 @@
      void setAppId(const QString &appId);
      bool isValid() const;
++    bool isTouchApp() const;
      QString filename() const;
      QString displayName() const;
      QString icon() const;
 === modified file 'plugins/Unity/Launcher/launcheritem.cpp'
 --- plugins/Unity/Launcher/launcheritem.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Unity/Launcher/launcheritem.cpp	2015-12-02 17:26:09 +0000
@@ -35,6 +35,7 @@
      m_countVisible(false),
      m_focused(false),
      m_alerting(false),
++    m_isTouchApp(false),
      m_quickList(new QuickListModel(this))
+ {
      QuickListEntry nameAction;
@@ -212,6 +213,19 @@
+     }
+ }
++bool LauncherItem::isTouchApp() const
++{
++    return m_isTouchApp;
++}
++
++void LauncherItem::setIsTouchApp(bool isTouchApp)
++{
++    if (m_isTouchApp != isTouchApp) {
++        m_isTouchApp = isTouchApp;
++        Q_EMIT isTouchAppChanged(isTouchApp);
++    }
++}
++
  unity::shell::launcher::QuickListModelInterface *LauncherItem::quickList() const
+ {
      return m_quickList;
 === modified file 'plugins/Unity/Launcher/launcheritem.h'
 --- plugins/Unity/Launcher/launcheritem.h	2015-07-23 14:13:57 +0000
 +++ plugins/Unity/Launcher/launcheritem.h	2015-12-02 17:26:09 +0000
@@ -45,6 +45,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    bool isTouchApp() 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 setIsTouchApp(bool isTouchApp);
  private:
      QString m_appId;
@@ -72,6 +74,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    bool m_isTouchApp;
      QuickListModel *m_quickList;
      QuickListEntry m_quitAction;
 === modified file 'plugins/Unity/Launcher/launchermodel.cpp'
 --- plugins/Unity/Launcher/launchermodel.cpp	2015-09-14 09:11:08 +0000
 +++ plugins/Unity/Launcher/launchermodel.cpp	2015-12-02 17:26:09 +0000
@@ -76,18 +76,22 @@
              return item->icon();
          case RolePinned:
              return item->pinned();
++        case RoleRunning:
++            return item->running();
++        case RoleRecent:
++            return item->recent();
++        case RoleProgress:
++            return item->progress();
          case RoleCount:
              return item->count();
          case RoleCountVisible:
              return item->countVisible();
--        case RoleProgress:
--            return item->progress();
          case RoleFocused:
              return item->focused();
          case RoleAlerting:
              return item->alerting();
--        case RoleRunning:
--            return item->running();
++        case RoleIsTouchApp:
++            return item->isTouchApp();
          default:
              qWarning() << Q_FUNC_INFO << "missing role, implement me";
              return QVariant();
@@ -147,6 +151,21 @@
+     }
+ }
++LauncherItem *LauncherModel::loadLauncherItem(const QString &appId)
++{
++    DesktopFileHandler desktopFile(appId);
++    if (!desktopFile.isValid()) {
++        return nullptr;
++    }
++
++    LauncherItem *item = new LauncherItem(appId,
++                                          desktopFile.displayName(),
++                                          desktopFile.icon(),
++                                          this);
++    item->setIsTouchApp(desktopFile.isTouchApp());
++    return item;
++}
++
  void LauncherModel::pin(const QString &appId, int index)
+ {
      int currentIndex = findApplication(appId);
@@ -166,17 +185,13 @@
              index = m_list.count();
+         }
--        DesktopFileHandler desktopFile(appId);
--        if (!desktopFile.isValid()) {
++        LauncherItem *item = loadLauncherItem(appId);
++        if (!item) {
              qWarning() << "Can't pin this application, there is no .desktop file available.";
              return;
+         }
          beginInsertRows(QModelIndex(), index, index);
--        LauncherItem *item = new LauncherItem(appId,
--                                              desktopFile.displayName(),
--                                              desktopFile.icon(),
--                                              this);
          item->setPinned(true);
          m_list.insert(index, item);
          endInsertRows();
@@ -385,11 +400,8 @@
+         }
      } else {
          // Need to create a new LauncherItem and show the highlight
--        DesktopFileHandler desktopFile(appId);
--        if (countVisible && desktopFile.isValid()) {
--            LauncherItem *item = new LauncherItem(appId,
--                                                  desktopFile.displayName(),
--                                                  desktopFile.icon());
++        LauncherItem *item = loadLauncherItem(appId);
++        if (countVisible && item) {
              item->setCountVisible(true);
              beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
              m_list.append(item);
@@ -447,16 +459,12 @@
          if (itemIndex == -1) {
              // Need to add it. Just add it into the addedIndex to keep same ordering as the list
              // in the settings.
--            DesktopFileHandler desktopFile(entry);
--            if (!desktopFile.isValid()) {
++            LauncherItem *item = loadLauncherItem(entry);
++            if (!item) {
                  qWarning() << "Couldn't find a .desktop file for" << entry << ". Skipping...";
                  continue;
+             }
--            LauncherItem *item = new LauncherItem(entry,
--                                                  desktopFile.displayName(),
--                                                  desktopFile.icon(),
--                                                  this);
              item->setPinned(true);
              beginInsertRows(QModelIndex(), addedIndex, addedIndex);
              m_list.insert(addedIndex, item);
@@ -521,7 +529,7 @@
          item->setRecent(true);
          item->setRunning(true);
          item->setFocused(app->focused());
--
++        item->setIsTouchApp(app->isTouchApp());
          beginInsertRows(QModelIndex(), m_list.count(), m_list.count());
          m_list.append(item);
          endInsertRows();
 === modified file 'plugins/Unity/Launcher/launchermodel.h'
 --- plugins/Unity/Launcher/launchermodel.h	2015-07-29 12:32:57 +0000
 +++ plugins/Unity/Launcher/launchermodel.h	2015-12-02 17:26:09 +0000
@@ -68,8 +68,8 @@
  private:
      void storeAppList();
--
      void unpin(const QString &appId);
++    LauncherItem *loadLauncherItem(const QString &appId);
  private Q_SLOTS:
      void countChanged(const QString &appId, int count);
 === modified file 'qml/Components/Dialogs.qml'
 --- qml/Components/Dialogs.qml	2015-11-06 10:06:58 +0000
 +++ qml/Components/Dialogs.qml	2015-12-02 17:26:09 +0000
@@ -46,6 +46,19 @@
          d.showPowerDialog();
+     }
++    function showLegacyAppLaunchDialog(appId) {
++        if (usageScenario != "desktop" && !d.legacyAppLaunchWarningPopup) {
++            var comp = Qt.createComponent(Qt.resolvedUrl("LegacyAppLaunchWarningDialog.qml"))
++            d.legacyAppLaunchWarningPopup = comp.createObject(root, {appId: appId});
++            d.legacyAppLaunchWarningPopup.cancel.connect(function() {
++                ApplicationManager.approveApplicationStart(d.legacyAppLaunchWarningPopup.appId, false);
++                d.legacyAppLaunchWarningPopup.hide();
++                d.legacyAppLaunchWarningPopup.destroy();
++                d.legacyAppLaunchWarningPopup = null;
++            });
++        }
++    }
++
      onUsageScenarioChanged: {
          if (usageScenario != "desktop" && legacyAppsModel.count > 0 && !d.modeSwitchWarningPopup) {
              var comp = Qt.createComponent(Qt.resolvedUrl("ModeSwitchWarningDialog.qml"))
@@ -58,10 +71,18 @@
                  d.modeSwitchWarningPopup.destroy();
                  d.modeSwitchWarningPopup = null;
              })
--        } else if (usageScenario == "desktop" && d.modeSwitchWarningPopup) {
--            d.modeSwitchWarningPopup.hide();
--            d.modeSwitchWarningPopup.destroy();
--            d.modeSwitchWarningPopup = null;
++        } else if (usageScenario == "desktop") {
++            if (d.modeSwitchWarningPopup) {
++                d.modeSwitchWarningPopup.hide();
++                d.modeSwitchWarningPopup.destroy();
++                d.modeSwitchWarningPopup = null;
++            }
++            if (d.legacyAppLaunchWarningPopup) {
++                ApplicationManager.approveApplicationStart(d.legacyAppLaunchWarningPopup.appId, true);
++                d.legacyAppLaunchWarningPopup.hide();
++                d.legacyAppLaunchWarningPopup.destroy();
++                d.legacyAppLaunchWarningPopup = null;
++            }
+         }
+     }
@@ -118,6 +139,7 @@
          objectName: "dialogsPrivate"
          property var modeSwitchWarningPopup: null
++        property var legacyAppLaunchWarningPopup: null
          function showPowerDialog() {
              if (!dialogLoader.active) {
 === added file 'qml/Components/LegacyAppLaunchWarningDialog.qml'
 --- qml/Components/LegacyAppLaunchWarningDialog.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/LegacyAppLaunchWarningDialog.qml	2015-12-02 17:26:09 +0000
@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2015 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/>.
++ */
++
++import QtQuick 2.4
++import QtQuick.Layouts 1.1
++import Ubuntu.Components 1.3
++import Ubuntu.Components.ListItems 1.3
++
++ShellDialog {
++    id: root
++    objectName: "legacyAppLaunchWarningDialog"
++
++    property string appId
++
++    signal cancel()
++
++    Label {
++        text: i18n.tr("Dock your device to open this app")
++        fontSize: "large"
++        wrapMode: Text.Wrap
++        color: "#5D5D5D"
++    }
++
++    ThinDivider {}
++
++    RowLayout {
++        layoutDirection: Qt.RightToLeft
++
++        Button {
++            objectName: "cancelButton"
++            text: i18n.tr("Cancel")
++            color: UbuntuColors.lightGrey
++            onClicked: {
++                root.cancel();
++            }
++        }
++    }
++}
 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2015-11-26 13:28:43 +0000
 +++ qml/Shell.qml	2015-12-02 17:26:09 +0000
@@ -216,6 +216,15 @@
              onApplicationAdded: {
                  launcher.hide();
+             }
++
++            onApplicationStartApprovalRequested: {
++                var app = ApplicationManager.findApplication(appId);
++                if (!app.isTouchApp && shell.usageScenario !== "desktop") {
++                    dialogs.showLegacyAppLaunchDialog(appId);
++                } else {
++                    ApplicationManager.approveApplicationStart(appId, true);
++                }
++            }
+         }
          Loader {
 === modified file 'tests/mocks/Unity/Application/Application.qmltypes'
 --- tests/mocks/Unity/Application/Application.qmltypes	2015-02-13 09:01:16 +0000
 +++ tests/mocks/Unity/Application/Application.qmltypes	2015-12-02 17:26:09 +0000
@@ -164,6 +164,11 @@
              type: "bool"
              Parameter { name: "appId"; type: "string" }
+         }
++        Method {
++            name: "approveApplicationStart"
++            Parameter { name: "appId"; type: "string" }
++            Parameter { name: "approved"; type: "bool" }
++        }
          Method { name: "availableApplications"; type: "QStringList" }
          Method {
              name: "add"
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-11-05 14:04:32 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-12-02 17:26:09 +0000
@@ -219,6 +219,8 @@
+     }
      application->setState(ApplicationInfo::Starting);
++    Q_EMIT applicationStartApprovalRequested(appId);
++
      return application;
+ }
@@ -253,6 +255,18 @@
      return true;
+ }
++bool ApplicationManager::approveApplicationStart(const QString &appId, bool approved)
++{
++    ApplicationInfo *application = findApplication(appId);
++    if (application == nullptr)
++        return false;
++
++    if (!approved) {
++        remove(application);
++    }
++    return true;
++}
++
  QString ApplicationManager::focusedApplicationId() const {
      for (ApplicationInfo *app : m_runningApplications) {
          if (app->focused()) {
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
 --- tests/mocks/Unity/Application/ApplicationManager.h	2015-10-01 17:43:10 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.h	2015-12-02 17:26:09 +0000
@@ -67,6 +67,7 @@
      Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
      Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, ExecFlags flags, const QStringList &arguments = QStringList());
      Q_INVOKABLE bool stopApplication(const QString &appId) override;
++    Q_INVOKABLE bool approveApplicationStart(const QString &appId, bool approved) override;
      QString focusedApplicationId() const override;
 === 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	2015-12-02 17:26:09 +0000
@@ -1,5 +1,3 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
--
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
+ )
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherItem.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-09-22 10:44:21 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherItem.cpp	2015-12-02 17:26:09 +0000
@@ -182,6 +182,19 @@
+     }
+ }
++bool MockLauncherItem::isTouchApp() const
++{
++    return m_isTouchApp;
++}
++
++void MockLauncherItem::setIsTouchApp(bool isTouchApp)
++{
++    if (m_isTouchApp != isTouchApp) {
++        m_isTouchApp = isTouchApp;
++        Q_EMIT isTouchAppChanged(isTouchApp);
++    }
++}
++
  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	2015-12-02 17:26:09 +0000
@@ -46,6 +46,7 @@
      bool countVisible() const override;
      bool focused() const override;
      bool alerting() const override;
++    bool isTouchApp() 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 setIsTouchApp(bool isTouchApp);
      QString m_appId;
      QString m_desktopFile;
@@ -71,6 +73,7 @@
      bool m_countVisible;
      bool m_focused;
      bool m_alerting;
++    bool m_isTouchApp;
      MockQuickListModel *m_quickList;
      friend class MockLauncherModel;
 === modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
 --- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-11-04 11:29:16 +0000
 +++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2015-12-02 17:26:09 +0000
@@ -117,6 +117,8 @@
          return item->focused();
      case RoleAlerting:
          return item->alerting();
++    case RoleIsTouchApp:
++        return item->isTouchApp();
+     }
      return QVariant();
 === modified file 'tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-10-26 14:05:14 +0000
 +++ tests/plugins/Greeter/Unity/Launcher/CMakeLists.txt	2015-12-02 17:26:09 +0000
@@ -1,5 +1,3 @@
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
--
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
 === modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
 --- tests/plugins/Unity/Launcher/CMakeLists.txt	2015-10-26 14:05:14 +0000
 +++ tests/plugins/Unity/Launcher/CMakeLists.txt	2015-12-02 17:26:09 +0000
@@ -1,5 +1,4 @@
  pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
--pkg_check_modules(LAUNCHER_API REQUIRED unity-shell-launcher=7)
  include_directories(
      ${CMAKE_CURRENT_SOURCE_DIR}
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-11-06 13:27:15 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-12-02 17:26:09 +0000
@@ -101,6 +101,9 @@
+         }
          return false;
+     }
++    bool approveApplicationStart(const QString &, bool) override {
++        return true;
++    }
      bool focusApplication(const QString &appId) override {
          Q_FOREACH(MockApp* app, m_list) {
              app->setFocused(app->appId() == appId);
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-24 17:44:18 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-12-02 17:26:09 +0000
@@ -25,6 +25,7 @@
  import Unity.Application 0.1
  import Unity.Connectivity 0.1
  import Unity.Indicators 0.1
++import Unity.Launcher 0.1
  import Unity.Notifications 1.0
  import Unity.Test 0.1
  import Powerd 0.1
@@ -1947,5 +1948,39 @@
                  compare(ApplicationManager.findApplication("libreoffice") === null, true);
+             }
+         }
++
++        function test_preventOpeningLegacyAppsWithoutDesktop_data() {
++            return [
++                {tag: "cancel", plug: false },
++                {tag: "dock", plug: true }
++            ];
++        }
++
++        function test_preventOpeningLegacyAppsWithoutDesktop(data) {
++            loadShell("phone");
++
++            // Start a legacy app
++            ApplicationManager.startApplication("libreoffice");
++
++            // The popup should appear
++            var popup = findChild(root, "legacyAppLaunchWarningDialog");
++            verify(popup !== null);
++
++            if (data.plug) {
++                shell.usageScenario = "desktop";
++                waitForRendering(shell);
++            } else {
++                var cancelButton = findChild(popup, "cancelButton");
++                mouseClick(cancelButton);
++                waitForRendering(root);
++            }
++
++            // Popup must be gone now
++            popup = findChild(root, "legacyAppLaunchWarningDialog");
++            verify(popup === null);
++
++            // And libreoffice will be started or not depending on user action
++            compare(ApplicationManager.findApplication("libreoffice") !== null, data.plug);
++        }
+     }
+ }