Merge lp:~boiko/dialer-app/rtm-fullscreen_emergency_mode into lp:dialer-app/rtm-14.09

[Gustavo Pichorim Boiko]

Switch dialer-app to fullscreen mode when running on top of the greeter.

Switch dialer-app to fullscreen mode when running on top of the greeter.

== Checklist ==
Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~boiko/telephony-service/rtm-dont_crash_no_dbus/+merge/240717

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
Yes

If you changed UI labels, did you update the pot file?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[lp:~boiko/dialer-app/rtm-fullscreen_emergency_mode]

234. By Gustavo Pichorim Boiko on 2014-11-03

Add a qml test for the fullscreen emergency mode feature.

235. By Gustavo Pichorim Boiko on 2014-11-05

Add some extra build time dependencies so that the QML test succeed.

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-09-05 19:54:09 +0000
+++ debian/control	2014-11-05 12:53:46 +0000
@@ -9,10 +9,12 @@
                python3-all:any,
                dh-python,
                qml-module-qttest,
+               qml-module-qt-labs-settings,
                qt5-default,
                qtbase5-dev (>= 5.0),
                qtdeclarative5-dev (>= 5.0),
                qtdeclarative5-dev-tools,
+               qtdeclarative5-ubuntu-telephony0.1 | qtdeclarative5-ubuntu-telephony-plugin,
                qtdeclarative5-ubuntu-ui-toolkit-plugin,
                xvfb,
 Standards-Version: 3.9.4

=== modified file 'src/dialerapplication.cpp'
--- src/dialerapplication.cpp	2014-08-22 14:51:14 +0000
+++ src/dialerapplication.cpp	2014-11-05 12:53:46 +0000
@@ -60,7 +60,7 @@
 
 
 DialerApplication::DialerApplication(int &argc, char **argv)
-    : QGuiApplication(argc, argv), m_view(0), m_applicationIsReady(false)
+    : QGuiApplication(argc, argv), m_view(0), m_applicationIsReady(false), m_fullScreen(false)
 {
     setApplicationName("DialerApp");
     setOrganizationName("com.ubuntu.dialer-app");
@@ -70,7 +70,6 @@
 {
     installIconPath();
     static QList<QString> validSchemes;
-    bool fullScreen = false;
 
     if (validSchemes.isEmpty()) {
         validSchemes << "tel" << "dialer";
@@ -85,7 +84,7 @@
 
     if (arguments.contains("--fullscreen")) {
         arguments.removeAll("--fullscreen");
-        fullScreen = true;
+        m_fullScreen = true;
     }
 
     // The testability driver is only loaded by QApplication but not by QGuiApplication.
@@ -150,7 +149,7 @@
     }
 
     m_view->setSource(QUrl::fromLocalFile("dialer-app.qml"));
-    if (fullScreen) {
+    if (m_fullScreen) {
         m_view->showFullScreen();
     } else {
         m_view->show();
@@ -159,6 +158,18 @@
     return true;
 }
 
+bool DialerApplication::fullScreen() const
+{
+    return m_fullScreen;
+}
+
+void DialerApplication::setFullScreen(bool value)
+{
+    m_fullScreen = value;
+    m_view->setWindowState(m_fullScreen ? Qt::WindowFullScreen : Qt::WindowNoState);
+    Q_EMIT fullScreenChanged();
+}
+
 DialerApplication::~DialerApplication()
 {
     if (m_view) {

=== modified file 'src/dialerapplication.h'
--- src/dialerapplication.h	2014-08-22 14:51:14 +0000
+++ src/dialerapplication.h	2014-11-05 12:53:46 +0000
@@ -26,18 +26,24 @@
 class DialerApplication : public QGuiApplication
 {
     Q_OBJECT
+    Q_PROPERTY(bool fullScreen READ fullScreen WRITE setFullScreen NOTIFY fullScreenChanged)
 
 public:
     DialerApplication(int &argc, char **argv);
     virtual ~DialerApplication();
 
     bool setup();
+    bool fullScreen() const;
+    void setFullScreen(bool value);
 
 public Q_SLOTS:
     void activateWindow();
     void parseArgument(const QString &arg);
     QStringList mmiPluginList();
 
+Q_SIGNALS:
+    void fullScreenChanged();
+
 private Q_SLOTS:
     void onViewStatusChanged(QQuickView::Status status);
     void onApplicationReady();
@@ -46,6 +52,7 @@
     QQuickView *m_view;
     QString m_arg;
     bool m_applicationIsReady;
+    bool m_fullScreen;
 };
 
 #endif // DIALERAPPLICATION_H

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-10-06 19:59:17 +0000
+++ src/qml/dialer-app.qml	2014-11-05 12:53:46 +0000
@@ -99,6 +99,12 @@
         id: phoneUtils
     }
 
+    Binding {
+        target: application
+        property: "fullScreen"
+        value: greeter.greeterActive
+    }
+
     states: [
         State {
             name: "greeterMode"

=== modified file 'tests/qml/CMakeLists.txt'
--- tests/qml/CMakeLists.txt	2014-09-05 19:53:38 +0000
+++ tests/qml/CMakeLists.txt	2014-11-05 12:53:46 +0000
@@ -17,6 +17,7 @@
 
 if(QMLTESTRUNNER_BIN AND XVFB_RUN_BIN)
     declare_qml_test("keypad_button" tst_KeypadButton.qml)
+    declare_qml_test("main_view" tst_MainView.qml)
 else()
     if (NOT QMLTESTRUNNER_BIN)
         message(WARNING "Qml tests disabled: qmltestrunner not found")

=== added file 'tests/qml/tst_MainView.qml'
--- tests/qml/tst_MainView.qml	1970-01-01 00:00:00 +0000
+++ tests/qml/tst_MainView.qml	2014-11-05 12:53:46 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of dialer-app.
+ *
+ * dialer-app 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.
+ *
+ * dialer-app 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.2
+import QtTest 1.0
+import Ubuntu.Test 0.1
+
+Item {
+    id: root
+
+    width: units.gu(40)
+    height: units.gu(60)
+
+    Item {
+        id: application
+        property bool fullScreen: false
+    }
+
+    Item {
+        id: greeter
+        property bool greeterActive: false
+    }
+
+    Loader {
+        source: '../../src/qml/dialer-app.qml'
+    }
+
+    UbuntuTestCase {
+        id: mainViewTestCase
+        name: 'mainViewTestCase'
+
+        when: windowShown
+
+        function init() {
+        }
+
+        function cleanup() {
+        }
+
+        function test_mainViewSwitchesToFullScreenWhenGreeterActive() {
+            // set the greeter as active
+            greeter.greeterActive = true;
+            tryCompare(application, 'fullScreen', true);
+
+            // and make sure it comes back as false when leaving greeter mode
+            greeter.greeterActive = false;
+            tryCompare(application, 'fullScreen', false);
+        }
+    }
+}