Merge lp:~mterry/unity8/dialer-above into lp:unity8

[Michael Terry]

Allow running the dialer-app in emergency mode when the screen is locked.

Allow running the dialer-app in emergency mode when the screen is locked.

The intent is to unlock the phone temporarily, and only give access to the dialer app.

This has some risk, security wise. After talking to Marc from security, here is the approach used:

0) (not in this branch) Have the dialer-app pay attention to when the phone is locked and expose a different, emergency mode UI. This reduces functionality and does not give access to contact information or call history.

1) Disable all edges while in emergency mode. This is to help stop us switching to a different app as well as to remove all distractions or even accidental app switching while the user is having an emergency.

2) If an app does requests focus or manages to get launched somehow (maybe a notification is clicked, or the dialer-app crashes, or it has a bug where it lets you launch another app or whatever), we lock the screen.

All that said, if there is a bug in this branch, it is a security problem, because the screen might become unlocked without entering the password.

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - Yes. lp:~mterry/unity8/is-active and lp:~mterry/unity8/show-greeter-dbus both expose information that dialer-app will need and there is a dialer-app branch we'll want that uses the emergency mode UI (link coming)

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

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:984
http://jenkins.qa.ubuntu.com/job/unity8-ci/3274/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1380
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/278
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/368
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/368/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2322
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2322/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9066

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/dialer-above]

985. By Michael Terry on 2014-07-01

Disable emergency call button on wider devices (tablets)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:985
http://jenkins.qa.ubuntu.com/job/unity8-ci/3286/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1407
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/380
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/380/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2357
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2357/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9092

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/dialer-above]

986. By Michael Terry on 2014-07-02

Fix qmluitest

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:986
http://jenkins.qa.ubuntu.com/job/unity8-ci/3301/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1494
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/305
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/395
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/395/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/395
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2465
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2465/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9195

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Text conflict in qml/Shell.qml
1 conflicts encountered.

review: Needs Fixing

[lp:~mterry/unity8/dialer-above]

987. By Michael Terry on 2014-07-11

Merge from show-greeter-dbus

988. By Michael Terry on 2014-07-15

Set mock lightdm for PhoneStage test

989. By Michael Terry on 2014-07-15

Fix qmluitest

990. By Michael Terry on 2014-07-15

Only enable greeter drag area if greeter is also enabled (I keep forgetting that isn't automatic)

991. By Michael Terry on 2014-07-17

Add some more braces for single-line ifs

[Seth Arnold (seth-arnold)]

I think I should have reviewed this MP first, some of this has been replaced elsewhere. Oh well, the parts that looked new looked good. One comment inline, of no real consequence. Thanks!

review: Approve

[lp:~mterry/unity8/dialer-above]

992. By Michael Terry on 2014-07-18

Merge from trunk

Unmerged revisions

=== modified file 'plugins/LightDM/DBusGreeter.cpp'
--- plugins/LightDM/DBusGreeter.cpp	2014-07-02 19:12:51 +0000
+++ plugins/LightDM/DBusGreeter.cpp	2014-07-02 19:12:51 +0000
@@ -34,6 +34,11 @@
     return m_greeter->isActive();
 }
 
+void DBusGreeter::ShowGreeter()
+{
+    return Q_EMIT m_greeter->showGreeter();
+}
+
 void DBusGreeter::isActiveChangedHandler()
 {
     notifyPropertyChanged("IsActive", isActive());

=== modified file 'plugins/LightDM/DBusGreeter.h'
--- plugins/LightDM/DBusGreeter.h	2014-07-02 19:12:51 +0000
+++ plugins/LightDM/DBusGreeter.h	2014-07-02 19:12:51 +0000
@@ -37,6 +37,7 @@
     explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
 
     bool isActive() const;
+    Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
 
 Q_SIGNALS:
     void isActiveChanged();

=== modified file 'plugins/LightDM/Greeter.h'
--- plugins/LightDM/Greeter.h	2014-07-02 19:12:51 +0000
+++ plugins/LightDM/Greeter.h	2014-07-02 19:12:51 +0000
@@ -60,6 +60,7 @@
     void authenticationUserChanged(const QString &user);
     void isActiveChanged();
     void promptlessChanged();
+    void showGreeter();
 
     // This signal is emitted by external agents like indicators, and the UI
     // should switch to this user if possible.

=== modified file 'qml/Components/Lockscreen.qml'
--- qml/Components/Lockscreen.qml	2014-06-11 15:36:51 +0000
+++ qml/Components/Lockscreen.qml	2014-07-02 19:12:51 +0000
@@ -186,6 +186,17 @@
     }
 
     Column {
+        id: emergencyCallColumn
+
+        // FIXME: We *should* show emergency dialer if there is a SIM present,
+        // regardless of whether the side stage is enabled.  But right now,
+        // the assumption is that narrow screens are phones which have SIMs
+        // and wider screens are tablets which don't.  When we do allow this
+        // on devices with a side stage and a SIM, work should be done to
+        // ensure that the main stage is disabled while the dialer is present
+        // in the side stage.
+        visible: !shell.sideStageEnabled
+
         anchors {
             left: parent.left
             bottom: parent.bottom
@@ -203,11 +214,6 @@
             name: "phone-app-call-symbolic"
             color: "#f3f3e7"
             opacity: 0.6
-
-            MouseArea {
-                anchors.fill: parent
-                onClicked: root.emergencyCall()
-            }
         }
 
         Label {
@@ -219,6 +225,12 @@
         }
     }
 
+    MouseArea {
+        anchors.fill: emergencyCallColumn
+        onClicked: root.emergencyCall()
+        enabled: emergencyCallColumn.visible
+    }
+
     Component {
         id: infoPopupComponent
         Dialog {

=== renamed file 'qml/Dash/graphics/phone/screenshots/[e-mail]' => 'qml/Dash/graphics/phone/screenshots/[e-mail]'
=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-07-02 19:12:51 +0000
+++ qml/Shell.qml	2014-07-02 19:12:51 +0000
@@ -136,7 +136,7 @@
                 id: dash
                 objectName: "dash"
 
-                available: !greeter.shown && !lockscreen.shown
+                available: !LightDM.Greeter.active
                 hides: [stages, launcher, panel.indicators]
                 shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
                 enabled: disappearingAnimationProgress === 0.0 && greeterWrapper.showProgress === 0.0 && edgeDemo.dashEnabled
@@ -199,7 +199,7 @@
 
         x: {
             if (shown) {
-                if (overlayMode || locked) {
+                if (overlayMode || locked || greeter.fakeActiveForApp !== "") {
                     return 0;
                 }
                 return launcher.progress
@@ -244,10 +244,17 @@
             target: ApplicationManager
 
             onFocusRequested: {
+                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== appId) {
+                    lockscreen.show();
+                }
+                greeter.hide();
                 stages.show(true);
             }
 
             onFocusedApplicationIdChanged: {
+                if (greeter.fakeActiveForApp !== "" && greeter.fakeActiveForApp !== ApplicationManager.focusedApplicationId) {
+                    lockscreen.show();
+                }
                 if (ApplicationManager.focusedApplicationId.length > 0) {
                     stages.show(false);
                 } else {
@@ -300,6 +307,11 @@
 
             Binding {
                 target: applicationsDisplayLoader.item
+                property: "objectName"
+                value: "stage"
+            }
+            Binding {
+                target: applicationsDisplayLoader.item
                 property: "moving"
                 value: !stages.fullyShown
             }
@@ -313,6 +325,11 @@
                 property: "dragAreaWidth"
                 value: shell.edgeSize
             }
+            Binding {
+                target: applicationsDisplayLoader.item
+                property: "spreadEnabled"
+                value: greeter.fakeActiveForApp === "" // to support emergency dialer hack
+            }
         }
     }
 
@@ -337,6 +354,13 @@
 
         onEntered: LightDM.Greeter.respond(passphrase);
         onCancel: greeter.show()
+        onEmergencyCall: {
+            greeter.fakeActiveForApp = "dialer-app"
+            shell.activateApplication("dialer-app")
+            lockscreen.hide()
+        }
+
+        onShownChanged: if (shown) greeter.fakeActiveForApp = ""
 
         Component.onCompleted: {
             if (LightDM.Users.count == 1) {
@@ -348,6 +372,8 @@
     Connections {
         target: LightDM.Greeter
 
+        onShowGreeter: greeter.show()
+
         onShowPrompt: {
             if (LightDM.Users.count == 1) {
                 // TODO: There's no better way for now to determine if its a PIN or a passphrase.
@@ -367,6 +393,7 @@
             }
             if (LightDM.Greeter.authenticated) {
                 lockscreen.hide();
+                greeter.login();
             } else {
                 lockscreen.clear(true);
             }
@@ -376,7 +403,7 @@
     Binding {
         target: LightDM.Greeter
         property: "active"
-        value: greeter.shown || lockscreen.shown
+        value: greeter.shown || lockscreen.shown || greeter.fakeActiveForApp != ""
     }
 
     Rectangle {
@@ -399,11 +426,16 @@
         }
 
         readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
+        onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
 
         Greeter {
             id: greeter
             objectName: "greeter"
 
+            signal sessionStarted() // helpful for tests
+
+            property string fakeActiveForApp: ""
+
             available: true
             hides: [launcher, panel.indicators]
             shown: true
@@ -415,14 +447,28 @@
 
             dragHandleWidth: shell.edgeSize
 
+            function login() {
+                enabled = false;
+                LightDM.Greeter.startSessionSync();
+                sessionStarted();
+                greeter.hide();
+                lockscreen.hide();
+                launcher.hide();
+                enabled = true;
+            }
+
             onShownChanged: {
                 if (shown) {
                     lockscreen.reset();
+                    if (!LightDM.Greeter.promptless) {
+                       lockscreen.show();
+                    }
                     // If there is only one user, we start authenticating with that one here.
                     // If there are more users, the Greeter will handle that
                     if (LightDM.Users.count == 1) {
                         LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
                     }
+                    greeter.fakeActiveForApp = "";
                     greeter.forceActiveFocus();
                 }
             }
@@ -472,12 +518,36 @@
     }
 
     function showHome() {
-        var animate = !greeter.shown && !stages.shown
-        greeter.hide()
+        if (edgeDemo.running)
+            return
+
+        if (LightDM.Greeter.active) {
+            if (!LightDM.Greeter.promptless)
+                lockscreen.show()
+            greeter.hide()
+        }
+
+        var animate = !LightDM.Greeter.active && !stages.shown
         dash.setCurrentScope("clickscope", animate, false)
         stages.hide()
     }
 
+    function showDash() {
+        if (LightDM.Greeter.active && !LightDM.Greeter.promptless)
+            return;
+
+        if (stages.shown && !stages.overlayMode) {
+            if (!stages.locked) {
+                stages.hide();
+                launcher.hide();
+            }
+        }
+        if (greeter.shown) {
+            greeter.hideRight();
+            launcher.hide();
+        }
+    }
+
     function hideIndicatorMenu(delay) {
         panel.hideIndicatorMenu(delay);
     }
@@ -489,17 +559,18 @@
 
         Panel {
             id: panel
+            objectName: "panel"
             anchors.fill: parent //because this draws indicator menus
             indicatorsMenuWidth: parent.width > units.gu(60) ? units.gu(40) : parent.width
             indicators {
                 hides: [launcher]
-                available: edgeDemo.panelEnabled
+                available: edgeDemo.panelEnabled && greeter.fakeActiveForApp === ""
                 contentEnabled: edgeDemo.panelContentEnabled
             }
             property string focusedAppId: ApplicationManager.focusedApplicationId
             property var focusedApplication: ApplicationManager.findApplication(focusedAppId)
-            fullscreenMode: focusedApplication && stages.fullscreen && !greeter.shown && !lockscreen.shown
-            searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
+            fullscreenMode: (focusedApplication && stages.fullscreen && !LightDM.Greeter.active) || greeter.fakeActiveForApp !== ""
+            searchVisible: !LightDM.Greeter.active && dash.shown && dash.searchable
 
             InputFilterArea {
                 anchors {
@@ -524,6 +595,7 @@
 
         Launcher {
             id: launcher
+            objectName: "launcher"
 
             readonly property bool dashSwipe: progress > 0
 
@@ -531,28 +603,14 @@
             anchors.bottom: parent.bottom
             width: parent.width
             dragAreaWidth: shell.edgeSize
-            available: edgeDemo.launcherEnabled
-
-            onShowDashHome: {
-                if (edgeDemo.running)
-                    return;
-
-                showHome()
-            }
-            onDash: {
-                if (stages.shown && !stages.overlayMode) {
-                    if (!stages.locked) {
-                        stages.hide();
-                        launcher.hide();
-                    }
-                }
-                if (greeter.shown) {
-                    greeter.hideRight();
-                    launcher.hide();
-                }
-            }
+            available: edgeDemo.launcherEnabled && greeter.fakeActiveForApp === ""
+
+            onShowDashHome: showHome()
+            onDash: showDash()
             onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
             onLauncherApplicationSelected: {
+                if (greeter.fakeActiveForApp !== "")
+                    lockscreen.show()
                 if (!edgeDemo.running)
                     shell.activateApplication(appId)
             }

=== modified file 'qml/Stages/PhoneStage.qml'
--- qml/Stages/PhoneStage.qml	2014-05-26 14:12:20 +0000
+++ qml/Stages/PhoneStage.qml	2014-07-02 19:12:51 +0000
@@ -18,6 +18,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Gestures 0.1
 import Unity.Application 0.1
+import LightDM 0.1 as LightDM
 import Utils 0.1
 import "../Components"
 
@@ -33,6 +34,7 @@
     readonly property bool painting: mainScreenshotImage.visible || fadeInScreenshotImage.visible || appSplash.visible || spreadView.visible
     property bool fullscreen: priv.focusedApplication ? priv.focusedApplication.fullscreen : false
     property bool locked: spreadView.visible
+    property bool spreadEnabled: true
 
     // Not used for PhoneStage, only useful for SideStage and similar
     property bool overlayMode: false
@@ -131,6 +133,11 @@
                 mainScreenshotImage.visible = true;
             } else if (priv.secondApplicationStarting && priv.waitingForScreenshot) {
                 applicationSwitchingAnimation.start();
+                if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
+                    // When greeter is up, no fancy animations, since user may
+                    // glimpse an app they shouldn't
+                    applicationSwitchingAnimation.complete();
+                }
             }
             waitingForScreenshot = false;
         }
@@ -145,6 +152,11 @@
                 priv.newFocusedAppId = appId;
                 root.fullscreen = ApplicationManager.findApplication(appId).fullscreen;
                 applicationSwitchingAnimation.start();
+                if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
+                    // When greeter is up, no fancy animations, since user may
+                    // glimpse an app they shouldn't
+                    applicationSwitchingAnimation.complete();
+                }
             } else {
                 ApplicationManager.focusApplication(appId);
             }
@@ -244,7 +256,7 @@
     EdgeDragArea {
         id: spreadDragArea
         direction: Direction.Leftwards
-        enabled: ApplicationManager.count > 1 && spreadView.phase != 2
+        enabled: ApplicationManager.count > 1 && spreadView.phase != 2 && root.spreadEnabled
 
         anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
         width: root.dragAreaWidth

=== renamed file 'qml/graphics/applicationIcons/[e-mail]' => 'qml/graphics/applicationIcons/[e-mail]'
=== modified file 'tests/autopilot/unity8/shell/tests/test_notifications.py'
--- tests/autopilot/unity8/shell/tests/test_notifications.py	2014-06-11 15:36:51 +0000
+++ tests/autopilot/unity8/shell/tests/test_notifications.py	2014-07-02 19:12:51 +0000
@@ -137,7 +137,7 @@
             ("x-canonical-switch-to-application", "true"),
             (
                 "x-canonical-secondary-icon",
-                self._get_icon_path('applicationIcons/phone-app.png')
+                self._get_icon_path('applicationIcons/dialer-app.png')
             )
         ]
 
@@ -172,7 +172,7 @@
         hints = [
             (
                 "x-canonical-secondary-icon",
-                self._get_icon_path('applicationIcons/phone-app.png')
+                self._get_icon_path('applicationIcons/dialer-app.png')
             ),
             ("x-canonical-snap-decisions", "true"),
         ]
@@ -435,7 +435,7 @@
         hints = [
             (
                 "x-canonical-secondary-icon",
-                self._get_icon_path('applicationIcons/phone-app.png')
+                self._get_icon_path('applicationIcons/dialer-app.png')
             )
         ]
 
@@ -677,7 +677,7 @@
         body = 'This bubble uses the icon-title-body layout with a ' \
             'secondary icon.'
         icon_path = self._get_icon_path('avatars/anna_olsson.png')
-        hint_icon = self._get_icon_path('applicationIcons/phone-app.png')
+        hint_icon = self._get_icon_path('applicationIcons/dialer-app.png')
 
         notification = shell.create_ephemeral_notification(
             summary,

=== modified file 'tests/mocks/LightDM/single-pin/GreeterPrivate.cpp'
--- tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2013-06-06 12:18:34 +0000
+++ tests/mocks/LightDM/single-pin/GreeterPrivate.cpp	2014-07-02 19:12:51 +0000
@@ -19,8 +19,6 @@
 #include "../Greeter.h"
 #include "../GreeterPrivate.h"
 
-#include <QDebug>
-
 namespace QLightDM
 {
 
@@ -34,19 +32,13 @@
 void GreeterPrivate::handleAuthenticate()
 {
     Q_Q(Greeter);
-
-    qDebug() << "handleAuthentication called!" << authenticationUser;
-
-    Q_EMIT q->showPrompt("PIN:", Greeter::PromptTypeSecret);
+    Q_EMIT q->showPrompt("PIN", Greeter::PromptTypeSecret);
 }
 
 void GreeterPrivate::handleRespond(const QString &response)
 {
     Q_Q(Greeter);
-
-
     authenticated = (response == "1234");
-    qDebug() << "responding" << response << authenticated;
     Q_EMIT q->authenticationComplete();
 }
 

=== modified file 'tests/mocks/Unity/Application/ApplicationManager.cpp'
--- tests/mocks/Unity/Application/ApplicationManager.cpp	2014-03-20 09:45:39 +0000
+++ tests/mocks/Unity/Application/ApplicationManager.cpp	2014-07-02 19:12:51 +0000
@@ -361,9 +361,9 @@
     ApplicationInfo *application;
 
     application = new ApplicationInfo(this);
-    application->setAppId("phone-app");
-    application->setName("Phone");
-    application->setIcon(QUrl("phone"));
+    application->setAppId("dialer-app");
+    application->setName("Dialer");
+    application->setIcon(QUrl("dialer"));
     application->setStage(ApplicationInfo::SideStage);
     application->setScreenshot(QString("image://application/%1/%2").arg(application->appId()).arg(QDateTime::currentMSecsSinceEpoch()));
     generateQmlStrings(application);

=== modified file 'tests/mocks/Unity/Launcher/MockLauncherModel.cpp'
--- tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2014-05-29 14:32:07 +0000
+++ tests/mocks/Unity/Launcher/MockLauncherModel.cpp	2014-07-02 19:12:51 +0000
@@ -22,7 +22,7 @@
 
 MockLauncherModel::MockLauncherModel(QObject* parent): LauncherModelInterface(parent)
 {
-    MockLauncherItem *item = new MockLauncherItem("phone-app", "/usr/share/applications/phone-app.desktop", "Phone", "phone-app", this);
+    MockLauncherItem *item = new MockLauncherItem("dialer-app", "/usr/share/applications/dialer-app.desktop", "Dialer", "dialer-app", this);
     item->setProgress(0);
     m_list.append(item);
     item->setFocused(true);

=== modified file 'tests/plugins/LightDM/dbus.cpp'
--- tests/plugins/LightDM/dbus.cpp	2014-07-02 19:12:51 +0000
+++ tests/plugins/LightDM/dbus.cpp	2014-07-02 19:12:51 +0000
@@ -187,6 +187,13 @@
         QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());
     }
 
+    void testShowGreeter()
+    {
+        // Just confirm the call exists and doesn't fail
+        QDBusReply<void> reply = dbusMain->call("ShowGreeter");
+        QVERIFY(reply.isValid());
+    }
+
 private:
     QQuickView *view;
     Greeter *greeter;

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-06-18 07:24:08 +0000
+++ tests/qmltests/CMakeLists.txt	2014-07-02 19:12:51 +0000
@@ -19,8 +19,8 @@
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
 set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
 
-add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks
-                     ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
+add_qml_test(. Shell ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
+add_qml_test(. ShellWithPin ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single-pin")
 add_qml_test(Components Carousel)
 add_qml_test(Components DraggingArea)
 add_qml_test(Components EdgeDemoOverlay)

=== modified file 'tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml'
--- tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2014-02-06 19:12:15 +0000
+++ tests/qmltests/Dash/Apps/tst_RunningApplicationsGrid.qml	2014-07-02 19:12:51 +0000
@@ -30,7 +30,7 @@
             ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
         }
 
-        ApplicationManager.startApplication("phone-app");
+        ApplicationManager.startApplication("dialer-app");
         ApplicationManager.startApplication("webbrowser-app");
     }
 
@@ -70,7 +70,7 @@
             verify(browserTile != undefined)
             browserTile.onPressAndHold.connect(onBrowserLongPressed)
 
-            phoneTile = findChild(runningApplicationsGrid, "runningAppTile Phone")
+            phoneTile = findChild(runningApplicationsGrid, "runningAppTile Dialer")
             verify(phoneTile != undefined)
             phoneTile.onPressAndHold.connect(onPhoneLongPressed)
 

=== modified file 'tests/qmltests/Greeter/tst_Lockscreen.qml'
--- tests/qmltests/Greeter/tst_Lockscreen.qml	2014-06-11 15:36:51 +0000
+++ tests/qmltests/Greeter/tst_Lockscreen.qml	2014-07-02 19:12:51 +0000
@@ -57,7 +57,7 @@
         target: LightDM.Greeter
 
         onShowPrompt: {
-            if (text.indexOf("PIN") >= 0) {
+            if (text === "PIN") {
                 pinPadCheckBox.checked = false
             } else {
                 pinPadCheckBox.checked = true

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2014-04-14 17:26:06 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2014-07-02 19:12:51 +0000
@@ -115,7 +115,7 @@
         /* If I click on the icon of an application on the launcher
            Launcher::launcherApplicationSelected signal should be emitted with the
            corresponding desktop file. E.g. clicking on phone icon should yield
-           launcherApplicationSelected("[...]phone-app.desktop") */
+           launcherApplicationSelected("[...]dialer-app.desktop") */
         function test_clickingOnAppIconCausesSignalEmission() {
             launcher.lastSelectedApplication = ""
 
@@ -131,7 +131,7 @@
             mouseClick(appIcon, appIcon.width/2, appIcon.height/2)
 
             tryCompare(launcher, "lastSelectedApplication",
-                       "phone-app")
+                       "dialer-app")
 
             // Tapping on an application icon also dismisses the launcher
             revealer.waitUntilLauncherDisappears()

=== modified file 'tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml'
--- tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2014-03-31 10:47:51 +0000
+++ tests/qmltests/Notifications/tst_VisualSnapDecisionsQueue.qml	2014-07-02 19:12:51 +0000
@@ -67,7 +67,7 @@
             summary: "Incoming call",
             body: "Frank Zappa\n+44 (0)7736 027340",
             icon: "../graphics/avatars/funky.png",
-            secondaryIcon: "../graphics/applicationIcons/phone-app.png",
+            secondaryIcon: "../graphics/applicationIcons/dialer-app.png",
             actions: [{ id: "pickup_id", label: "Pick up"},
                       { id: "decline_1_id", label: "Decline"},
                       { id: "decline_2_id", label: "Can't talk now, what's up?"},

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2014-06-17 03:52:58 +0000
+++ tests/qmltests/tst_Shell.qml	2014-07-02 19:12:51 +0000
@@ -20,6 +20,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import GSettings 1.0
+import LightDM 0.1 as LightDM
 import Unity.Application 0.1
 import Unity.Test 0.1 as UT
 import Powerd 0.1
@@ -50,6 +51,11 @@
         id: shell
     }
 
+    SignalSpy {
+        id: sessionSpy
+        signalName: "sessionStarted"
+    }
+
     UT.UnityTestCase {
         name: "Shell"
         when: windowShown
@@ -91,6 +97,8 @@
             verify(ok);
 
             swipeAwayGreeter();
+
+            sessionSpy.target = findChild(shell, "greeter")
         }
 
         function cleanup() {
@@ -556,5 +564,24 @@
             tryCompare(greeter, "showProgress", 0)
             waitUntilApplicationWindowIsFullyVisible()
         }
+
+        function test_showGreeterDBusCall() {
+            var greeter = findChild(shell, "greeter")
+            tryCompare(greeter, "showProgress", 0)
+            LightDM.Greeter.showGreeter()
+            tryCompare(greeter, "showProgress", 1)
+        }
+
+        function test_login() {
+            sessionSpy.clear()
+
+            var greeter = findChild(shell, "greeter")
+            greeter.show()
+            tryCompare(greeter, "showProgress", 1)
+
+            tryCompare(sessionSpy, "count", 0)
+            swipeAwayGreeter()
+            tryCompare(sessionSpy, "count", 1)
+        }
     }
 }

=== added file 'tests/qmltests/tst_ShellWithPin.qml'
--- tests/qmltests/tst_ShellWithPin.qml	1970-01-01 00:00:00 +0000
+++ tests/qmltests/tst_ShellWithPin.qml	2014-07-02 19:12:51 +0000
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2014 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.0
+import QtTest 1.0
+import GSettings 1.0
+import LightDM 0.1 as LightDM
+import Unity.Application 0.1
+import Unity.Test 0.1 as UT
+import Powerd 0.1
+
+import "../../qml"
+
+Item {
+    width: shell.width
+    height: shell.height
+
+    QtObject {
+        id: applicationArguments
+
+        function hasGeometry() {
+            return false;
+        }
+
+        function width() {
+            return 0;
+        }
+
+        function height() {
+            return 0;
+        }
+    }
+
+    Shell {
+        id: shell
+    }
+
+    SignalSpy {
+        id: sessionSpy
+        signalName: "sessionStarted"
+    }
+
+    UT.UnityTestCase {
+        name: "ShellWithPin"
+        when: windowShown
+
+        function initTestCase() {
+            var ok = false;
+            var attempts = 0;
+            var maxAttempts = 1000;
+
+            // Qt loads a qml scene asynchronously. So early on, some findChild() calls made in
+            // tests may fail because the desired child item wasn't loaded yet.
+            // Thus here we try to ensure the scene has been fully loaded before proceeding with the tests.
+            // As I couldn't find an API in QQuickView & friends to tell me that the scene is 100% loaded
+            // (all items instantiated, etc), I resort to checking the existence of some key items until
+            // repeatedly until they're all there.
+            do {
+                var dashContentList = findChild(shell, "dashContentList");
+                waitForRendering(dashContentList);
+                var homeLoader = findChild(dashContentList, "clickscope loader");
+                ok = homeLoader !== null
+                    && homeLoader.item !== undefined;
+
+                var greeter = findChild(shell, "greeter");
+                ok &= greeter !== null;
+
+                var launcherPanel = findChild(shell, "launcherPanel");
+                ok &= launcherPanel !== null;
+
+                attempts++;
+                if (!ok) {
+                    console.log("Attempt " + attempts + " failed. Waiting a bit before trying again.");
+                    // wait a bit before retrying
+                    wait(100);
+                } else {
+                    console.log("All seem fine after " + attempts + " attempts.");
+                }
+            } while (!ok && attempts <= maxAttempts);
+
+            verify(ok);
+
+            sessionSpy.target = findChild(shell, "greeter")
+        }
+
+        function init() {
+            swipeAwayGreeter()
+        }
+
+        function cleanup() {
+            LightDM.Greeter.showGreeter()
+            var greeter = findChild(shell, "greeter")
+            tryCompare(greeter, "showProgress", 1)
+
+            // kill all (fake) running apps
+            killApps()
+        }
+
+        function killApps() {
+            while (ApplicationManager.count > 0) {
+                ApplicationManager.stopApplication(ApplicationManager.get(0).appId)
+            }
+            compare(ApplicationManager.count, 0)
+        }
+
+        function swipeAwayGreeter() {
+            var greeter = findChild(shell, "greeter");
+            tryCompare(greeter, "showProgress", 1);
+
+            var touchX = shell.width - (shell.edgeSize / 2);
+            var touchY = shell.height / 2;
+            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
+
+            // wait until the animation has finished
+            tryCompare(greeter, "showProgress", 0);
+
+            // and for pin to be ready
+            var lockscreen = findChild(shell, "lockscreen");
+            var pinPadLoader = findChild(lockscreen, "pinPadLoader");
+            tryCompare(pinPadLoader, "status", Loader.Ready)
+            waitForRendering(lockscreen)
+        }
+
+        function enterPin(pin) {
+            var inputField = findChild(shell, "pinentryField")
+            for (var i = 0; i < pin.length; ++i) {
+                var character = pin.charAt(i)
+                var button = findChild(shell, "pinPadButton" + character)
+                mouseClick(button, units.gu(1), units.gu(1))
+            }
+        }
+
+        function test_login() {
+            tryCompare(sessionSpy, "count", 0)
+            enterPin("1234")
+            tryCompare(sessionSpy, "count", 1)
+        }
+
+        function test_emergencyCall() {
+            var greeter = findChild(shell, "greeter")
+            var lockscreen = findChild(shell, "lockscreen")
+            var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
+            var panel = findChild(shell, "panel")
+            var indicators = findChild(shell, "indicators")
+            var launcher = findChild(shell, "launcher")
+            var stage = findChild(shell, "stage")
+
+            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+
+            tryCompare(lockscreen, "shown", false)
+            tryCompare(greeter, "fakeActiveForApp", "dialer-app")
+            tryCompare(panel, "fullscreenMode", true)
+            tryCompare(indicators, "available", false)
+            tryCompare(launcher, "available", false)
+            tryCompare(stage, "spreadEnabled", false)
+
+            // Cancel emergency mode, and go back to normal
+            LightDM.Greeter.showGreeter()
+
+            tryCompare(lockscreen, "shown", true)
+            tryCompare(greeter, "shown", true)
+            tryCompare(greeter, "fakeActiveForApp", "")
+            tryCompare(panel, "fullscreenMode", false)
+            tryCompare(indicators, "available", true)
+            tryCompare(launcher, "available", true)
+            tryCompare(stage, "spreadEnabled", true)
+        }
+
+        function test_emergencyCallCrash() {
+            var lockscreen = findChild(shell, "lockscreen")
+            var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
+            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+
+            tryCompare(lockscreen, "shown", false)
+            killApps() // kill dialer-app, as if it crashed
+            tryCompare(lockscreen, "shown", true)
+        }
+
+        function test_emergencyCallAppLaunch() {
+            var lockscreen = findChild(shell, "lockscreen")
+            var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
+            mouseClick(emergencyButton, units.gu(1), units.gu(1))
+
+            tryCompare(lockscreen, "shown", false)
+            ApplicationManager.startApplication("gallery-app", ApplicationManager.NoFlag)
+            tryCompare(lockscreen, "shown", true)
+        }
+    }
+}