Merge lp:~unity-team/unity8/wizard-auto-shutdown into lp:unity8

[Michał Sawicz]

Shut down the phone if the wizard does not see interaction for 2 minutes

[lp:~unity-team/unity8/wizard-auto-shutdown]

1595. By Michał Sawicz on 2015-02-06

Fix version and revert plugin changes

1596. By Michał Sawicz on 2015-02-06

The lowercase methods don't exist on the real implementation

1597. By Michał Sawicz on 2015-02-06

Fix qmltypes

1598. By Michał Sawicz on 2015-02-06

And make it a QtObject

1599. By Michał Sawicz on 2015-02-06

Fix better, and tweak the test a bit

1600. By Michał Sawicz on 2015-02-06

Move signal emission up

[Michael Terry (mterry)]

Looks great!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1600
http://jenkins.qa.ubuntu.com/job/unity8-ci/5251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1216
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1214
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1214/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17845

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

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Jenkins approved, so I top approve

[Andrea Cimitan (cimi)]

 * Are there any related MPs required for this MP to build/function as expected? Please list.
no
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y
 * Did you make sure that your branch does not contain spurious tags?
y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
n/a
 * If you changed the UI, has there been a design review?
n/a

review: Approve

[Michał Sawicz (saviq)]

Actually this got a bit less pressing, so some additional UX/UI work on this will happen.

Unmerged revisions

1600. By Michał Sawicz on 2015-02-06

Move signal emission up

1599. By Michał Sawicz on 2015-02-06

Fix better, and tweak the test a bit

1598. By Michał Sawicz on 2015-02-06

And make it a QtObject

1597. By Michał Sawicz on 2015-02-06

Fix qmltypes

1596. By Michał Sawicz on 2015-02-06

The lowercase methods don't exist on the real implementation

1595. By Michał Sawicz on 2015-02-06

Fix version and revert plugin changes

1594. By Michał Sawicz on 2015-02-06

Shut down the phone if the wizard does not see interaction for 2 minutes

=== modified file 'qml/Wizard/Pages.qml'
--- qml/Wizard/Pages.qml	2015-01-28 21:25:45 +0000
+++ qml/Wizard/Pages.qml	2015-02-06 13:48:24 +0000
@@ -29,6 +29,7 @@
     property string background
 
     signal quit()
+    signal pageLoaded(int index)
 
     // These should be set by a security page and we apply the settings when
     // the user exits the wizard.
@@ -109,6 +110,7 @@
             // First load it invisible, check that we should actually use
             // this page, and either skip it or continue.
             push(path, {"opacity": 0, "enabled": false})
+            root.pageLoaded(pageList.index)
 
             // Check for immediate skip or not.  We may have to wait for
             // skipValid to be assigned (see Connections object below)

=== modified file 'qml/Wizard/Wizard.qml'
--- qml/Wizard/Wizard.qml	2014-11-24 17:56:44 +0000
+++ qml/Wizard/Wizard.qml	2015-02-06 13:48:24 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.3
 import Ubuntu.Components 1.1
+import Unity.Session 0.1
 import Wizard 0.1
 import "../Components"
 
@@ -35,6 +36,14 @@
         }
     }
 
+    Timer {
+        id: idleTimer
+        objectName: "idleTimer"
+        interval: 120000
+        running: true
+        onTriggered: DBusUnitySessionService.shutdown()
+    }
+
     Loader {
         id: loader
         anchors.fill: parent
@@ -50,6 +59,7 @@
         Connections {
             target: loader.item
             onQuit: root.hide()
+            onPageLoaded: if (index > 0) idleTimer.stop()
         }
     }
 }

=== modified file 'tests/mocks/Unity/CMakeLists.txt'
--- tests/mocks/Unity/CMakeLists.txt	2015-02-04 13:22:27 +0000
+++ tests/mocks/Unity/CMakeLists.txt	2015-02-06 13:48:24 +0000
@@ -4,6 +4,7 @@
 add_subdirectory(Launcher)
 add_subdirectory(Notifications)
 add_subdirectory(DashCommunicator)
+add_subdirectory(Session)
 
 pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
 pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=5)

=== added directory 'tests/mocks/Unity/Session'
=== added file 'tests/mocks/Unity/Session/CMakeLists.txt'
--- tests/mocks/Unity/Session/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Session/CMakeLists.txt	2015-02-06 13:48:24 +0000
@@ -0,0 +1,1 @@
+add_unity8_mock(Unity.Session 0.1 Unity/Session)

=== added file 'tests/mocks/Unity/Session/DBusUnitySessionService.qml'
--- tests/mocks/Unity/Session/DBusUnitySessionService.qml	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Session/DBusUnitySessionService.qml	2015-02-06 13:48:24 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2015 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+pragma Singleton
+import QtQuick 2.3
+
+QtObject {
+    signal logout
+    signal reboot
+    signal shutdown
+}

=== added file 'tests/mocks/Unity/Session/Session.qmltypes'
--- tests/mocks/Unity/Session/Session.qmltypes	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Session/Session.qmltypes	2015-02-06 13:48:24 +0000
@@ -0,0 +1,22 @@
+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.Session 0.1 tests/mocks'
+
+Module {
+    Component {
+        prototype: "QObject"
+        name: "DBusUnitySessionService"
+        exports: ["DBusUnitySessionService -1.-1"]
+        exportMetaObjectRevisions: [-1]
+        isComposite: true
+        isCreatable: false
+        isSingleton: true
+        Signal { name: "logout" }
+        Signal { name: "reboot" }
+        Signal { name: "shutdown" }
+    }
+}

=== added file 'tests/mocks/Unity/Session/qmldir'
--- tests/mocks/Unity/Session/qmldir	1970-01-01 00:00:00 +0000
+++ tests/mocks/Unity/Session/qmldir	2015-02-06 13:48:24 +0000
@@ -0,0 +1,3 @@
+module Unity.Session
+typeinfo UnitySession.qmltypes
+singleton DBusUnitySessionService 0.1 DBusUnitySessionService.qml

=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	2014-12-11 14:10:18 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2015-02-06 13:48:24 +0000
@@ -21,6 +21,7 @@
 import QMenuModel 0.1
 import Ubuntu.Components 1.1
 import Ubuntu.SystemSettings.SecurityPrivacy 1.0
+import Unity.Session 0.1
 import Unity.Test 0.1 as UT
 import Wizard 0.1
 import "../../../qml/Wizard"
@@ -69,6 +70,12 @@
         signalName: "activated"
     }
 
+    SignalSpy {
+        id: sessionSpy
+        target: DBusUnitySessionService
+        signalName: "shutdown"
+    }
+
     function setup() {
         AccountsService.hereEnabled = false;
         AccountsService.hereLicensePath = Qt.resolvedUrl("licenses");
@@ -129,6 +136,7 @@
             var pages = findChild(wizard, "wizardPages");
             var security = findInvisibleChild(pages, "securityPrivacy");
             setSecuritySpy.target = security;
+            sessionSpy.clear();
 
             setup();
         }
@@ -499,5 +507,18 @@
             tap(findChild(page, "backButton"));
             waitForPage("locationPage");
         }
+
+        function test_idleTimer() {
+            var timer = findInvisibleChild(wizard, "idleTimer");
+            timer.triggered();
+            sessionSpy.wait();
+        }
+
+        function test_notIdleTimer() {
+            goToPage("simPage");
+            var timer = findInvisibleChild(wizard, "idleTimer");
+            verify(!timer.running, "Idle timer should be stopped");
+            compare(sessionSpy.count, 0, "Shutdown should not have been called");
+        }
     }
 }