Unity 8

Merge lp:~mterry/unity8/no-touch-no-lifecycle into lp:unity8

no-touch-no-lifecycle
Merge into trunk

Proposed by Michael Terry on 2015-10-27

Status:	Merged
Approved by:	Gerry Boland on 2015-11-04
Approved revision:	2001
Merged at revision:	2031
Proposed branch:	lp:~mterry/unity8/no-touch-no-lifecycle
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/new_fix_upsidedown
Diff against target:	651 lines (+218/-86) 15 files modified CMakeLists.txt (+1/-1) debian/control (+2/-2) qml/Stages/AbstractStage.qml (+63/-0) qml/Stages/DesktopStage.qml (+4/-20) qml/Stages/PhoneStage.qml (+18/-29) qml/Stages/ShimStage.qml (+1/-1) qml/Stages/TabletStage.qml (+14/-32) tests/mocks/GSettings.1.0/fake_gsettings.cpp (+31/-0) tests/mocks/GSettings.1.0/fake_gsettings.h (+10/-0) tests/mocks/Unity/Application/ApplicationInfo.cpp (+12/-0) tests/mocks/Unity/Application/ApplicationInfo.h (+4/-0) tests/mocks/Unity/Application/ApplicationManager.cpp (+9/-0) tests/mocks/Unity/Application/ApplicationManager.h (+1/-1) tests/plugins/Unity/Launcher/launchermodeltest.cpp (+1/-0) tests/qmltests/tst_Shell.qml (+47/-0)
To merge this branch:	bzr merge lp:~mterry/unity8/no-touch-no-lifecycle
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2015-10-27	Approve on 2015-11-04
PS Jenkins bot (community)	continuous-integration	2015-10-27	Needs Fixing on 2015-11-04
Daniel d'Andrada (community)			Abstain on 2015-10-28
Andrea Cimitan		2015-10-27	Pending
Review via email: mp+275919@code.launchpad.net

This proposal supersedes a proposal from 2015-09-29.

Commit message

Handle lifecycle policy exceptions ourselves, instead of letting qtmir do it for us and allow non-Touch apps to opt-out of the Touch lifecycle.

This requires using the new isTouchApp unity-api property to ApplicationInfoInterface.

Now that qtmir won't decide policy for suspending exemptions anymore, we take over the interpretation of the lifecycleException GSettings key. Since the GSettings key for that was registered under the qtmir namespace (and there's no technical reason to migrate settings), I left the schema in qtmir itself. We merely consume it.

Description of the change

== Checklist ==

* Are there any related MPs required for this MP to build/function as expected? Please list.
- https://code.launchpad.net/~mterry/unity-api/no-touch-no-lifecycle/+merge/272829
- https://code.launchpad.net/~mterry/qtmir/no-touch-no-lifecycle/+merge/272791

* 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 a member of that team.

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-02: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Andrea Cimitan (cimi) on 2015-10-08: Posted in a previous version of this proposal

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2015-10-08: Posted in a previous version of this proposal

> 1.2 for now

Done.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-09: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-10-15: Posted in a previous version of this proposal

=== added file 'qml/graphics/applicationIcons/libreoffice@18.png'
Binary files qml/graphics/applicationIcons/libreoffice@18.png 1970-01-01 00:00:00 +0000 and qml/graphics/applicationIcons/libreoffice@18.png 2015-10-08 19:48:39 +0000 differ
Why did that change?

review: Needs Information

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-10-15: Posted in a previous version of this proposal

=== added file 'qml/Stages/AbstractStage.qml'
Instead of destroying and re-creating the GSettings instance when Stage changes, could this file be a Singleton shared by all Stages?

+Rectangle {
This looks like a useless rectangle, no color is set. It could be a QtObject, if you weren't inheriting from it.

Oh, I see why the LibreOffice icon. Please ignore above comment

review: Needs Fixing

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-10-15: Posted in a previous version of this proposal

+ !model.isTouchApp
+ || isExemptFromLifecycle(model.appId)
I think it would improve readability to make a quick boolean property :
canSuspend: model.isTouchApp && !isExemptFromLifecycle(model.appId)

Revision history for this message

Michael Terry (mterry) wrote on 2015-10-15: Posted in a previous version of this proposal

> === added file 'qml/Stages/AbstractStage.qml'
> Instead of destroying and re-creating the GSettings instance when
> Stage changes, could this file be a Singleton shared by all Stages?

It could be, sure, but I wasn't in the mindset of optimizing for Stage changes. What about the hundred other objects that get destroyed & created in that case? Are GSettings instances particularly expensive (honest question)?

> +Rectangle {
> This looks like a useless rectangle, no color is set. It could be
> a QtObject, if you weren't inheriting from it.

Fair point. I was trying to avoid unrelated changes by not merging common Stage code. I've done that now, and consolidated the color: settings as well as the public API for stages (which various of the Stage implementations didn't fully implement!).

> + !model.isTouchApp
> + || isExemptFromLifecycle(model.appId)
> I think it would improve readability to make a quick boolean property :
> canSuspend: model.isTouchApp && !isExemptFromLifecycle(model.appId)

Good point. Done.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-15: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-10-27

1994. By Michael Terry on 2015-10-27: Go back to using 1.3
1995. By Michael Terry on 2015-10-27: Merge new_fix_upsidedown branch

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-10-28:

"Set lifecycle policy ourselves, instead of letting qtmir do it for us and allow non-Touch apps to opt-out of the Touch lifecycle."

This commit message is not correct. Unity 8 is *already* controlling the lifecycle policy.

The only thing missing in trunk is the "allow non-Touch apps to opt-out of the Touch lifecycle" part.

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-10-28:

test_lifecyclePolicy is testing again ground already covered by test_unfocusedAppsAreResumedWhenEnteringWindowedMode and test_unfocusedAppsGetSuspendedAfterEnteringStagedMode.

It's too comprehensive. You can't and should not expect a single test to cover all angles and aspects of lifecycle policy as that catch-all name (test_lifecyclePolicy) implies. You should write a test specifically for this new Application.isTouchApp property. Ie, how its value affects the Application.requestedState value set by unity8. Eg: tst_touchAppsAreNeverSuspended.

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2015-10-28:

> This commit message is not correct. Unity 8 is *already* controlling the lifecycle policy.

Sort of. Qtmir was overriding unity8's requests based on its own handling of the exception list. This branch moves that handling into unity8, so that unity8 is wholly responsible for policy. I've made the commit message clearer.

> test_lifecyclePolicy is testing again ground already covered by test_unfocusedAppsAreResumedWhenEnteringWindowedMode and test_unfocusedAppsGetSuspendedAfterEnteringStagedMode.

Sure, OK. I'll split the test in two (exception list and isTouchApp) and remove the sanity checks that duplicate checks in those tests. New commit coming.

Revision history for this message

Michael Terry (mterry) wrote on 2015-10-28:

Alright. I made the requested test change. I still like having "control group" checks, but I understand the argument that those other test methods are the control group.

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-10-28

1996. By Michael Terry on 2015-10-28: Break test apart

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-10-28:

Thanks for splitting it into smaller tests.

For the sake of clarity it's worth checking that libreoffice and webbrowser-app are not focused before the final compare() calls. Afterall, the only reason you launched a second app after them was to get them unfocused. A check (and/or comment) would make your intent clear.

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-10-28

1997. By Michael Terry on 2015-10-28: Also confirm that app no longer has focus

Revision history for this message

Michael Terry (mterry) wrote on 2015-10-28:

> For the sake of clarity it's worth checking that libreoffice
> and webbrowser-app are not focused before the final compare() calls.

Done.

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-10-28

1998. By Michael Terry on 2015-10-28: Add quick clarifying comment

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-10-28:

Thanks!

review: Abstain

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-28:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-10-30

1999. By Michael Terry on 2015-10-30: Bump shell application version
2000. By Michael Terry on 2015-10-30: Bump shell application version harder

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-10-31:

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/no-touch-no-lifecycle updated on 2015-11-03

2001. By Michael Terry on 2015-11-03: Whoops, remove testing changes

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2015-11-04:

Tested on device, unable to detect any regression, looks good!

review: Approve

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-10-21 11:51:38 +0000
 +++ CMakeLists.txt	2015-11-03 20:18:21 +0000
@@ -57,7 +57,7 @@
  find_package(Qt5Concurrent 5.2 REQUIRED)
  find_package(Qt5Sql 5.2 REQUIRED)
--pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=9)
++pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=10)
  # Standard install paths
  include(GNUInstallDirs)
 === modified file 'debian/control'
 --- debian/control	2015-10-21 11:51:11 +0000
 +++ debian/control	2015-11-03 20:18:21 +0000
@@ -127,7 +127,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-9,
++         unity-application-impl-10,
           unity-notifications-impl-3,
           unity-plugin-scopes | unity-scopes-impl,
           unity-scopes-impl-7,
@@ -173,7 +173,7 @@
  Depends: ${misc:Depends},
           ${shlibs:Depends},
  Provides: unity-application-impl,
--          unity-application-impl-9,
++          unity-application-impl-10,
  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
 === added file 'qml/Stages/AbstractStage.qml'
 --- qml/Stages/AbstractStage.qml	1970-01-01 00:00:00 +0000
 +++ qml/Stages/AbstractStage.qml	2015-11-03 20:18:21 +0000
@@ -0,0 +1,63 @@
++/*
++ * 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 Ubuntu.Components 1.3
++import GSettings 1.0
++
++Rectangle {
++    id: root
++
++    color: "#111111"
++
++    // Controls to be set from outside
++    property bool altTabPressed
++    property url background
++    property bool beingResized
++    property int dragAreaWidth
++    property bool interactive
++    property real inverseProgress // This is the progress for left edge drags, in pixels.
++    property bool keepDashRunning: true
++    property real maximizedAppTopMargin
++    property real nativeHeight
++    property real nativeWidth
++    property QtObject orientations
++    property int shellOrientation
++    property int shellOrientationAngle
++    property bool spreadEnabled: true // If false, animations and right edge will be disabled
++    property bool suspended
++
++    // To be read from outside
++    property var mainApp: null
++    property int mainAppWindowOrientationAngle
++    property bool orientationChangesEnabled
++
++    // Shared code for use in stage implementations
++    GSettings {
++        id: lifecycleExceptions
++        schema.id: "com.canonical.qtmir"
++    }
++
++    function isExemptFromLifecycle(appId) {
++        var shortAppId = appId.split('_')[0];
++        for (var i = 0; i < lifecycleExceptions.lifecycleExemptAppids.length; i++) {
++            if (shortAppId === lifecycleExceptions.lifecycleExemptAppids[i]) {
++                return true;
++            }
++        }
++        return false;
++    }
++}
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2015-11-03 20:18:21 +0000
 +++ qml/Stages/DesktopStage.qml	2015-11-03 20:18:21 +0000
@@ -26,35 +26,17 @@
  import Utils 0.1
  import Ubuntu.Gestures 0.1
--Rectangle {
++AbstractStage {
      id: root
      anchors.fill: parent
--    // Controls to be set from outside
--    property int dragAreaWidth // just to comply with the interface shared between stages
--    property real maximizedAppTopMargin
--    property bool interactive
--    property bool spreadEnabled // just to comply with the interface shared between stages
--    property real inverseProgress: 0 // just to comply with the interface shared between stages
--    property int shellOrientationAngle: 0
--    property int shellOrientation
--    property QtObject orientations
--    property bool beingResized: false
--    property bool keepDashRunning: true
--    property bool suspended: false
--    property alias background: wallpaper.source
--    property alias altTabPressed: spread.altTabPressed
--
      // functions to be called from outside
      function updateFocusedAppOrientation() { /* TODO */ }
      function updateFocusedAppOrientationAnimated() { /* TODO */}
--    // To be read from outside
--    readonly property var mainApp: ApplicationManager.focusedApplicationId
++    mainApp: ApplicationManager.focusedApplicationId
              ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
              : null
--    property int mainAppWindowOrientationAngle: 0
--    readonly property bool orientationChangesEnabled: false
      Connections {
          target: ApplicationManager
@@ -122,6 +104,7 @@
          CrossFadeImage {
              id: wallpaper
              anchors.fill: parent
++            source: root.background
              sourceSize { height: root.height; width: root.width }
              fillMode: Image.PreserveAspectCrop
+         }
@@ -275,5 +258,6 @@
          anchors.fill: parent
          workspace: appContainer
          focus: state == "altTab"
++        altTabPressed: root.altTabPressed
+     }
+ }
 === modified file 'qml/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2015-11-03 20:18:21 +0000
 +++ qml/Stages/PhoneStage.qml	2015-11-03 20:18:21 +0000
@@ -22,29 +22,15 @@
  import Utils 0.1
  import "../Components"
--Rectangle {
++AbstractStage {
      id: root
--    // Controls to be set from outside
--    property int dragAreaWidth
--    property real maximizedAppTopMargin
--    property bool interactive
--    property bool spreadEnabled: true // If false, animations and right edge will be disabled
--    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
      property QtObject applicationManager: ApplicationManager
      property bool focusFirstApp: true // If false, focused app will appear on right edge like other apps
      property bool altTabEnabled: true
      property real startScale: 1.1
      property real endScale: 0.7
--    property bool keepDashRunning: true
--    property bool suspended: false
--    property int shellOrientationAngle: 0
--    property int shellOrientation
--    property QtObject orientations
--    property real nativeWidth
--    property real nativeHeight
--    property bool beingResized: false
      onBeingResizedChanged: {
          if (beingResized) {
              // Brace yourselves for impact!
@@ -56,6 +42,8 @@
              priv.reset();
+         }
+     }
++
++    // Functions to be called from outside
      function updateFocusedAppOrientation() {
          if (spreadRepeater.count > 0) {
              spreadRepeater.itemAt(0).matchShellOrientation();
@@ -85,16 +73,14 @@
+         }
+     }
--    // To be read from outside
--    readonly property var mainApp: applicationManager.focusedApplicationId
++    mainApp: applicationManager.focusedApplicationId
              ? applicationManager.findApplication(applicationManager.focusedApplicationId)
              : null
--    property int mainAppWindowOrientationAngle: 0
--    readonly property bool orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
--                                                   && !priv.focusedAppDelegateIsDislocated
--                                                   && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
--                                                   && spreadView.phase === 0
++    orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
++                               && !priv.focusedAppDelegateIsDislocated
++                               && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)
++                               && spreadView.phase === 0
      // How far left the stage has been dragged
      readonly property real dragProgress: spreadRepeater.count > 0 ? -spreadRepeater.itemAt(0).xTranslate : 0
@@ -106,8 +92,6 @@
      signal opened()
--    color: "#111111"
--
      function select(appId) {
          spreadView.snapTo(priv.indexOf(appId));
+     }
@@ -438,16 +422,21 @@
                      dropShadow: spreadView.active || priv.focusedAppDelegateIsDislocated
                      focusFirstApp: root.focusFirstApp
++                    readonly property bool isDash: model.appId == "unity8-dash"
++
++                    readonly property bool canSuspend: model.isTouchApp
++                            && !isExemptFromLifecycle(model.appId)
++
                      Binding {
                          target: appDelegate.application
                          property: "requestedState"
--                        value: (isDash && root.keepDashRunning) || (!root.suspended && appDelegate.focus)
--                            ? ApplicationInfoInterface.RequestedRunning
--                            : ApplicationInfoInterface.RequestedSuspended
++                        value: !canSuspend
++                                   || (isDash && root.keepDashRunning)
++                                   || (!root.suspended && appDelegate.focus)
++                               ? ApplicationInfoInterface.RequestedRunning
++                               : ApplicationInfoInterface.RequestedSuspended
+                     }
--                    readonly property bool isDash: model.appId == "unity8-dash"
--
                      z: isDash && !spreadView.active ? -1 : behavioredIndex
                      x: {
 === modified file 'qml/Stages/ShimStage.qml'
 --- qml/Stages/ShimStage.qml	2015-04-21 19:43:25 +0000
 +++ qml/Stages/ShimStage.qml	2015-11-03 20:18:21 +0000
@@ -17,7 +17,7 @@
  import QtQuick 2.3
  import Ubuntu.Components 0.1
--Rectangle {
++AbstractStage {
      id: shimStage
      anchors.fill: parent
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2015-11-03 20:18:21 +0000
 +++ qml/Stages/TabletStage.qml	2015-11-03 20:18:21 +0000
@@ -21,30 +21,12 @@
  import Utils 0.1
  import "../Components"
--Rectangle {
++AbstractStage {
      id: root
      objectName: "stages"
      anchors.fill: parent
--    color: "#111111"
--
--    // Controls to be set from outside
--    property int dragAreaWidth
--    property real maximizedAppTopMargin
--    property bool interactive
--    property alias beingResized: spreadView.beingResized
--
--    property bool spreadEnabled: true // If false, animations and right edge will be disabled
--
--    property real inverseProgress: 0 // This is the progress for left edge drags, in pixels.
--    property bool keepDashRunning: true
--    property bool suspended: false
--    property int shellOrientationAngle: 0
--
--    property int shellOrientation
--    property QtObject orientations
--    property real nativeWidth
--    property real nativeHeight
--
++
++    // Functions to be called from outside
      function updateFocusedAppOrientation() {
          var mainStageAppIndex = priv.indexOf(priv.mainStageAppId);
          if (mainStageAppIndex >= 0 && mainStageAppIndex < spreadRepeater.count) {
@@ -87,10 +69,7 @@
+         }
+     }
--    // To be read from outside
--    property var mainApp: null
--    property int mainAppWindowOrientationAngle: 0
--    readonly property bool orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
++    orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
      onWidthChanged: {
          spreadView.selectedIndex = -1;
@@ -303,7 +282,7 @@
+         }
          property bool animateX: true
--        property bool beingResized: false
++        property bool beingResized: root.beingResized
          onBeingResizedChanged: {
              if (beingResized) {
                  // Brace yourselves for impact!
@@ -630,15 +609,18 @@
                      readonly property bool isDash: model.appId == "unity8-dash"
++                    readonly property bool canSuspend: model.isTouchApp
++                            && !isExemptFromLifecycle(model.appId)
++
                      Binding {
                          target: spreadTile.application
                          property: "requestedState"
--                        value: (spreadTile.isDash && root.keepDashRunning)
--                            ||
--                            (!root.suspended && (model.appId == priv.mainStageAppId
--                                                 || model.appId == priv.sideStageAppId))
--                            ? ApplicationInfoInterface.RequestedRunning
--                            : ApplicationInfoInterface.RequestedSuspended
++                        value: !canSuspend
++                                   || (isDash && root.keepDashRunning)
++                                   || (!root.suspended && (model.appId == priv.mainStageAppId
++                                                           || model.appId == priv.sideStageAppId))
++                               ? ApplicationInfoInterface.RequestedRunning
++                               : ApplicationInfoInterface.RequestedSuspended
+                     }
                      // FIXME: A regular binding doesn't update any more after closing an app.
 === added file 'qml/graphics/applicationIcons/libreoffice@18.png'
 Binary files qml/graphics/applicationIcons/libreoffice@18.png	1970-01-01 00:00:00 +0000 and qml/graphics/applicationIcons/libreoffice@18.png	2015-11-03 20:18:21 +0000 differ
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.cpp'
 --- tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-09-02 13:06:56 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.cpp	2015-11-03 20:18:21 +0000
@@ -75,6 +75,19 @@
+     }
+ }
++QStringList GSettingsControllerQml::lifecycleExemptAppids() const
++{
++    return m_lifecycleExemptAppids;
++}
++
++void GSettingsControllerQml::setLifecycleExemptAppids(const QStringList &appIds)
++{
++    if (m_lifecycleExemptAppids != appIds) {
++        m_lifecycleExemptAppids = appIds;
++        Q_EMIT lifecycleExemptAppidsChanged(m_lifecycleExemptAppids);
++    }
++}
++
  GSettingsSchemaQml::GSettingsSchemaQml(QObject *parent): QObject(parent) {
+ }
@@ -114,6 +127,8 @@
              this, &GSettingsQml::usageModeChanged);
      connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lockedOutTimeChanged,
              this, &GSettingsQml::lockedOutTimeChanged);
++    connect(GSettingsControllerQml::instance(), &GSettingsControllerQml::lifecycleExemptAppidsChanged,
++            this, &GSettingsQml::lifecycleExemptAppidsChanged);
+ }
  GSettingsSchemaQml * GSettingsQml::schema() const {
@@ -167,3 +182,19 @@
          GSettingsControllerQml::instance()->setLockedOutTime(timestamp);
+     }
+ }
++
++QStringList GSettingsQml::lifecycleExemptAppids() const
++{
++    if (m_schema->id() == "com.canonical.qtmir") {
++        return GSettingsControllerQml::instance()->lifecycleExemptAppids();
++    } else {
++        return QStringList();
++    }
++}
++
++void GSettingsQml::setLifecycleExemptAppids(const QStringList &appIds)
++{
++    if (m_schema->id() == "com.canonical.qtmir") {
++        GSettingsControllerQml::instance()->setLifecycleExemptAppids(appIds);
++    }
++}
 === modified file 'tests/mocks/GSettings.1.0/fake_gsettings.h'
 --- tests/mocks/GSettings.1.0/fake_gsettings.h	2015-08-19 23:41:18 +0000
 +++ tests/mocks/GSettings.1.0/fake_gsettings.h	2015-11-03 20:18:21 +0000
@@ -19,6 +19,7 @@
  #include <QList>
  #include <QObject>
++#include <QStringList>
  class GSettingsSchemaQml: public QObject
+ {
@@ -48,6 +49,7 @@
      Q_PROPERTY(QString pictureUri READ pictureUri WRITE setPictureUri NOTIFY pictureUriChanged)
      Q_PROPERTY(QString usageMode READ usageMode WRITE setUsageMode NOTIFY usageModeChanged)
      Q_PROPERTY(qint64 lockedOutTime READ lockedOutTime WRITE setLockedOutTime NOTIFY lockedOutTimeChanged)
++    Q_PROPERTY(QStringList lifecycleExemptAppids READ lifecycleExemptAppids WRITE setLifecycleExemptAppids NOTIFY lifecycleExemptAppidsChanged)
  public:
      GSettingsQml(QObject *parent = nullptr);
@@ -56,16 +58,19 @@
      QString pictureUri() const;
      QString usageMode() const;
      qint64 lockedOutTime() const;
++    QStringList lifecycleExemptAppids() const;
      void setPictureUri(const QString &str);
      void setUsageMode(const QString &usageMode);
      void setLockedOutTime(qint64 timestamp);
++    void setLifecycleExemptAppids(const QStringList &appIds);
  Q_SIGNALS:
      void schemaChanged();
      void pictureUriChanged(const QString&);
      void usageModeChanged(const QString&);
      void lockedOutTimeChanged(qint64);
++    void lifecycleExemptAppidsChanged(const QStringList &);
  private:
      GSettingsSchemaQml* m_schema;
@@ -90,10 +95,14 @@
      qint64 lockedOutTime() const;
      Q_INVOKABLE void setLockedOutTime(qint64 timestamp);
++    QStringList lifecycleExemptAppids() const;
++    Q_INVOKABLE void setLifecycleExemptAppids(const QStringList &appIds);
++
  Q_SIGNALS:
      void pictureUriChanged(const QString&);
      void usageModeChanged(const QString&);
      void lockedOutTimeChanged(qint64 timestamp);
++    void lifecycleExemptAppidsChanged(const QStringList&);
  private:
      GSettingsControllerQml();
@@ -101,6 +110,7 @@
      QString m_pictureUri;
      QString m_usageMode;
      qint64 m_lockedOutTime;
++    QStringList m_lifecycleExemptAppids;
      static GSettingsControllerQml* s_controllerInstance;
      QList<GSettingsQml *> m_registeredGSettings;
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
 --- tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-08-31 10:25:07 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-11-03 20:18:21 +0000
@@ -41,6 +41,7 @@
              Qt::InvertedLandscapeOrientation)
      , m_rotatesWindowContents(false)
      , m_requestedState(RequestedRunning)
++    , m_isTouchApp(true)
      , m_manualSurfaceCreation(false)
+ {
+ }
@@ -58,6 +59,7 @@
              Qt::InvertedLandscapeOrientation)
      , m_rotatesWindowContents(false)
      , m_requestedState(RequestedRunning)
++    , m_isTouchApp(true)
      , m_manualSurfaceCreation(false)
+ {
+ }
@@ -245,6 +247,16 @@
+     }
+ }
++bool ApplicationInfo::isTouchApp() const
++{
++    return m_isTouchApp;
++}
++
++void ApplicationInfo::setIsTouchApp(bool isTouchApp)
++{
++    m_isTouchApp = isTouchApp;
++}
++
  void ApplicationInfo::onSessionSurfaceChanged(MirSurface* surface)
+ {
      if (surface != nullptr && m_state == Starting) {
 === modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
 --- tests/mocks/Unity/Application/ApplicationInfo.h	2015-08-03 15:00:47 +0000
 +++ tests/mocks/Unity/Application/ApplicationInfo.h	2015-11-03 20:18:21 +0000
@@ -89,6 +89,9 @@
      bool manualSurfaceCreation() const { return m_manualSurfaceCreation; }
      void setManualSurfaceCreation(bool value);
++    bool isTouchApp() const override;
++    void setIsTouchApp(bool isTouchApp); // only in mock
++
  public:
      void setSession(Session* session);
      Session* session() const { return m_session; }
@@ -121,6 +124,7 @@
      Qt::ScreenOrientations m_supportedOrientations;
      bool m_rotatesWindowContents;
      RequestedState m_requestedState;
++    bool m_isTouchApp;
      bool m_manualSurfaceCreation;
  };
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
 --- tests/mocks/Unity/Application/ApplicationManager.cpp	2015-08-03 13:47:44 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.cpp	2015-11-03 20:18:21 +0000
@@ -105,6 +105,8 @@
          return app->state();
      case RoleFocused:
          return app->focused();
++    case RoleIsTouchApp:
++        return app->isTouchApp();
      case RoleSession:
          return QVariant::fromValue(app->session());
      case RoleFullscreen:
@@ -458,6 +460,13 @@
      application->setName("YouTube");
      application->setIconId("youtube");
      m_availableApplications.append(application);
++
++    application = new ApplicationInfo(this);
++    application->setAppId("libreoffice");
++    application->setName("LibreOffice");
++    application->setIconId("libreoffice");
++    application->setIsTouchApp(false);
++    m_availableApplications.append(application);
+ }
 === modified file 'tests/mocks/Unity/Application/ApplicationManager.h'
 --- tests/mocks/Unity/Application/ApplicationManager.h	2015-06-19 18:19:33 +0000
 +++ tests/mocks/Unity/Application/ApplicationManager.h	2015-11-03 20:18:21 +0000
@@ -43,7 +43,7 @@
      static ApplicationManager *singleton();
      enum MoreRoles {
--        RoleSession = RoleFocused+1,
++        RoleSession = RoleIsTouchApp+1,
          RoleFullscreen,
      };
      enum Flag {
 === modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
 --- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-08-19 14:24:07 +0000
 +++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-11-03 20:18:21 +0000
@@ -57,6 +57,7 @@
      QColor splashColorFooter() const override { return QColor(0,0,0,0); }
      Qt::ScreenOrientations supportedOrientations() const override { return Qt::PortraitOrientation; }
      bool rotatesWindowContents() const override { return false; }
++    bool isTouchApp() const override { return true; }
      // Methods used for mocking (not in the interface)
      void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2015-11-03 20:18:21 +0000
 +++ tests/qmltests/tst_Shell.qml	2015-11-03 20:18:21 +0000
@@ -380,6 +380,8 @@
              LightDM.Greeter.authenticate(""); // reset greeter
              sessionSpy.clear();
++
++            GSettingsController.setLifecycleExemptAppids([]);
+         }
          function killApps() {
@@ -1780,5 +1782,50 @@
              waitForRendering(shell);
              tryCompare(panelButtons, "visible", true);
+         }
++
++        function test_lifecyclePolicyForNonTouchApp_data() {
++            return [
++                {tag: "phone", formFactor: "phone", usageScenario: "phone"},
++                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet"}
++            ]
++        }
++
++        function test_lifecyclePolicyForNonTouchApp(data) {
++            loadShell(data.formFactor);
++            shell.usageScenario = data.usageScenario;
++
++            var app1 = ApplicationManager.startApplication("libreoffice");
++            waitUntilAppWindowIsFullyLoaded(app1);
++            var app2 = ApplicationManager.startApplication("dialer-app");
++            waitUntilAppWindowIsFullyLoaded(app2);
++
++            // Make sure app1 is unfocused but still running
++            compare(app1.session.surface.activeFocus, false);
++            compare(app1.isTouchApp, false); // sanity check our mock, which sets this for us
++            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
++        }
++
++        function test_lifecyclePolicyExemption_data() {
++            return [
++                {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},
++                {tag: "tablet", formFactor: "tablet", usageScenario: "tablet", suspendsApps: true}
++            ]
++        }
++
++        function test_lifecyclePolicyExemption(data) {
++            loadShell(data.formFactor);
++            shell.usageScenario = data.usageScenario;
++
++            GSettingsController.setLifecycleExemptAppids(["webbrowser-app"]);
++
++            var app1 = ApplicationManager.startApplication("webbrowser-app");
++            waitUntilAppWindowIsFullyLoaded(app1);
++            var app2 = ApplicationManager.startApplication("dialer-app");
++            waitUntilAppWindowIsFullyLoaded(app2);
++
++            // Make sure app1 is unfocused but still running
++            compare(app1.session.surface.activeFocus, false);
++            compare(app1.requestedState, ApplicationInfoInterface.RequestedRunning);
++        }
+     }
+ }