Merge lp:~ci-train-bot/unity8/unity8-ubuntu-xenial-landing-058 into lp:unity8

[Michał Sawicz]

Unmerged revisions

2405. By CI Train Bot Account on 2016-05-18

Releasing 8.12+16.04.20160518.2-0ubuntu1

2404. By Lukáš Tinkl on 2016-05-18

Stabilize flaky wizard tests Fixes: #1582994
Approved by: Michael Terry

2403. By Michael Zanetti on 2016-05-18

fix the SIM PIN darkening after it got removed accidentally Fixes: #1577147
Approved by: Lukáš Tinkl

2402. By Lukáš Tinkl on 2016-05-18

Don't dim screen when the indicators are open Fixes: #1564342
Approved by: Michael Zanetti

2401. By Lukáš Tinkl on 2016-05-18

Fix upcoming alarms ETA labels Fixes: #1576741
Approved by: Albert Astals Cid

2400. By Nick Dedekind on 2016-05-18

Fixed saving current stage and loss of surface focus when switching stages

2399. By Nick Dedekind on 2016-05-18

Fixed incorrect osk surface item resizing the surface.
Approved by: Daniel d'Andrada

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-18 11:20:04 +0000
+++ debian/changelog	2016-05-19 08:20:26 +0000
@@ -1,3 +1,23 @@
+unity8 (8.12+16.04.20160518.2-0ubuntu1) xenial; urgency=medium
+
+  [ Lukáš Tinkl ]
+  * Don't dim screen when the indicators are open (LP: #1564342)
+  * Fix upcoming alarms ETA labels (LP: #1576741)
+  * Stabilize flaky wizard tests (LP: #1582994)
+
+  [ Michael Zanetti ]
+  * fix the SIM PIN darkening after it got removed accidentally (LP:
+    #1577147)
+
+  [ Michał Sawicz, Nick Dedekind ]
+  * Fixed saving current stage and loss of surface focus when switching
+    stages
+
+  [ Nick Dedekind ]
+  * Fixed incorrect osk surface item resizing the surface.
+
+ -- Michał Sawicz <[e-mail]>  Wed, 18 May 2016 22:02:39 +0000
+
 unity8 (8.12+16.04.20160518.1-0ubuntu1) xenial; urgency=medium
 
   [ CI Train Bot ]

=== modified file 'po/unity8.pot'
--- po/unity8.pot	2016-05-18 11:20:04 +0000
+++ po/unity8.pot	2016-05-19 08:20:26 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: unity8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-18 11:19+0000\n"
+"POT-Creation-Date: 2016-05-18 22:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -256,7 +256,7 @@
 msgid "Also installed"
 msgstr ""
 
-#: qml/DisabledScreenNotice.qml:104
+#: qml/DisabledScreenNotice.qml:109
 msgid ""
 "Your device is now connected to an external display. Use this screen as a "
 "touch pad to interact with the pointer."

=== modified file 'qml/Components/InputMethod.qml'
--- qml/Components/InputMethod.qml	2016-03-29 03:47:39 +0000
+++ qml/Components/InputMethod.qml	2016-05-19 08:20:26 +0000
@@ -30,8 +30,8 @@
 
         consumesInput: true
 
-        surfaceWidth: width
-        surfaceHeight: height
+        surfaceWidth: root.enabled ? width : -1
+        surfaceHeight: root.enabled ? height : -1
         surface: SurfaceManager.inputMethodSurface
 
         onLiveChanged: {

=== modified file 'qml/DisabledScreenNotice.qml'
--- qml/DisabledScreenNotice.qml	2016-02-18 19:50:30 +0000
+++ qml/DisabledScreenNotice.qml	2016-05-19 08:20:26 +0000
@@ -18,6 +18,7 @@
 import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 import Unity.Session 0.1
+import Unity.Screens 0.1
 import QtQuick.Window 2.2
 import "Components"
 
@@ -35,6 +36,10 @@
         name: applicationArguments.deviceName
     }
 
+    Screens {
+        id: screens
+    }
+
     Item {
         id: contentContainer
         objectName: "contentContainer"
@@ -119,6 +124,8 @@
 
         InputMethod {
             id: inputMethod
+            // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.
+            enabled: screens.count > 1
             objectName: "inputMethod"
             anchors.fill: parent
         }

=== modified file 'qml/Notifications/NotificationMenuItemFactory.qml'
--- qml/Notifications/NotificationMenuItemFactory.qml	2016-04-05 19:29:33 +0000
+++ qml/Notifications/NotificationMenuItemFactory.qml	2016-05-19 08:20:26 +0000
@@ -146,6 +146,7 @@
             errorText: errorAction.valid ? errorAction.state : ""
             retryText: notification.body
             background: menuFactory.background
+            darkenBackground: 0.4
 
             onEntered: {
                 menuModel.changeState(menuIndex, passphrase);

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2016-04-27 15:01:10 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2016-05-19 08:20:26 +0000
@@ -377,11 +377,11 @@
             property int menuIndex: -1
             property var extendedData: menuData && menuData.ext || undefined
 
-            property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
+            readonly property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
             LiveTimer {
                 frequency: LiveTimer.Relative
                 relativeTime: alarmItem.serverTime
-                onTrigger: alarmItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
+                onTrigger: alarmItem.time = i18n.relativeDateTime(alarmItem.serverTime)
             }
 
             text: menuData && menuData.label || ""

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2016-04-27 15:01:10 +0000
+++ qml/Panel/Panel.qml	2016-05-19 08:20:26 +0000
@@ -30,22 +30,13 @@
     property real indicatorAreaShowProgress: 1.0
     property bool locked: false
 
-    Rectangle {
-        id: darkenedArea
-        property real darkenedOpacity: 0.6
-        anchors {
-            fill: parent
-            topMargin: panelHeight
-        }
-        color: "black"
-        opacity: indicators.unitProgress * darkenedOpacity
+    MouseArea {
+        anchors.fill: parent
+        anchors.topMargin: panelHeight
         visible: !indicators.fullyClosed
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: if (indicators.fullyOpened) indicators.hide();
-            hoverEnabled: true // should also eat hover events, otherwise they will pass through
-        }
+        enabled: visible
+        onClicked: if (indicators.fullyOpened) indicators.hide();
+        hoverEnabled: true // should also eat hover events, otherwise they will pass through
     }
 
     Binding {

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2016-05-17 19:25:23 +0000
+++ qml/Stages/SurfaceContainer.qml	2016-05-19 08:20:26 +0000
@@ -34,6 +34,9 @@
     property int surfaceOrientationAngle: 0
     property bool resizeSurface: true
     property bool isPromptSurface: false
+    // FIME - dont export, use interactive property. Need to fix qtmir to handle consumesInputChanged
+    // to update surface activeFocus. See mock MirSurfaceItem.
+    property alias consumesInput: surfaceItem.consumesInput
 
     onSurfaceChanged: {
         // Not a binding because animations might remove the surface from the surfaceItem

=== modified file 'qml/Stages/TabletStage.qml'
--- qml/Stages/TabletStage.qml	2016-04-29 20:07:21 +0000
+++ qml/Stages/TabletStage.qml	2016-05-19 08:20:26 +0000
@@ -752,7 +752,7 @@
 
                     readonly property bool wantsMainStage: stage == ApplicationInfoInterface.MainStage
 
-                    readonly property bool isDash: model.application.appId == "unity8-dash"
+                    readonly property bool isDash: application.appId == "unity8-dash"
 
                     onFocusChanged: {
                         if (focus && !spreadRepeater.startingUp) {
@@ -768,7 +768,7 @@
                         onFocusRequested: spreadTile.focus = true;
                     }
                     Connections {
-                        target: model.application
+                        target: spreadTile.application
                         onFocusRequested: {
                             if (!model.surface) {
                                 // when an app has no surfaces, we assume there's only one entry representing it:
@@ -844,7 +844,7 @@
                         _constructing = false;
                     }
                     Component.onDestruction: {
-                        WindowStateStorage.saveStage(model.application.appId, stage);
+                        WindowStateStorage.saveStage(application.appId, stage);
                     }
 
                     function refreshStage() {
@@ -1073,6 +1073,7 @@
 
                 surface: spreadDelegate ? spreadDelegate.surface : null
 
+                consumesInput: false
                 interactive: false
                 resizeSurface: false
                 focus: false

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-04-27 15:01:10 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2016-05-19 08:20:26 +0000
@@ -56,7 +56,11 @@
         Qt::ExtraButton9 | Qt::ExtraButton10 | Qt::ExtraButton11 |
         Qt::ExtraButton12 | Qt::ExtraButton13);
 
+    connect(this, &QQuickItem::activeFocusChanged, this, &MirSurfaceItem::updateMirSurfaceActiveFocus);
     connect(this, &QQuickItem::visibleChanged, this, &MirSurfaceItem::updateMirSurfaceVisibility);
+    connect(this, &MirSurfaceItem::consumesInputChanged, this, [this]() {
+        updateMirSurfaceActiveFocus(hasActiveFocus());
+    });
 }
 
 MirSurfaceItem::~MirSurfaceItem()
@@ -234,6 +238,10 @@
         delete m_qmlContentComponent;
         m_qmlContentComponent = nullptr;
 
+        if (hasActiveFocus() && m_consumesInput && m_qmlSurface->live()) {
+            m_qmlSurface->setActiveFocus(false);
+        }
+
         disconnect(m_qmlSurface, nullptr, this, nullptr);
         m_qmlSurface->unregisterView((qintptr)this);
     }
@@ -243,8 +251,6 @@
     if (m_qmlSurface) {
         m_qmlSurface->registerView((qintptr)this);
 
-        m_qmlSurface->setActiveFocus(hasActiveFocus());
-
         updateSurfaceSize();
         updateMirSurfaceVisibility();
 
@@ -277,17 +283,20 @@
             default:
                 qFatal("MirSurfaceItem: Unhandled component status");
         }
+
+        if (m_consumesInput) {
+            m_qmlSurface->setActiveFocus(hasActiveFocus());
+        }
     }
 
     Q_EMIT surfaceChanged(m_qmlSurface);
 }
 
-void MirSurfaceItem::itemChange(ItemChange change, const ItemChangeData & value)
+
+void MirSurfaceItem::updateMirSurfaceActiveFocus(bool focused)
 {
-    if (change == QQuickItem::ItemActiveFocusHasChanged) {
-        if (m_qmlSurface) {
-            m_qmlSurface->setActiveFocus(value.boolValue);
-        }
+    if (m_qmlSurface && m_consumesInput && m_qmlSurface->live()) {
+        m_qmlSurface->setActiveFocus(focused);
     }
 }
 

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2016-03-29 03:47:39 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2016-05-19 08:20:26 +0000
@@ -98,12 +98,12 @@
     void mousePressEvent(QMouseEvent * event) override;
     void mouseMoveEvent(QMouseEvent * event) override;
     void mouseReleaseEvent(QMouseEvent * event) override;
-    void itemChange(ItemChange change, const ItemChangeData & value) override;
 
 private Q_SLOTS:
     void onComponentStatusChanged(QQmlComponent::Status status);
     void updateScreenshot(QUrl screenshot);
     void updateMirSurfaceVisibility();
+    void updateMirSurfaceActiveFocus(bool focused);
 
 private:
     void createQmlContentItem();

=== modified file 'tests/mocks/Utils/windowstatestorage.cpp'
--- tests/mocks/Utils/windowstatestorage.cpp	2016-03-29 03:47:39 +0000
+++ tests/mocks/Utils/windowstatestorage.cpp	2016-05-19 08:20:26 +0000
@@ -50,6 +50,7 @@
 void WindowStateStorage::saveStage(const QString &appId, int stage)
 {
     m_stage[appId] = stage;
+    Q_EMIT stageSaved(appId, stage);
 }
 
 int WindowStateStorage::getStage(const QString &appId) const

=== modified file 'tests/mocks/Utils/windowstatestorage.h'
--- tests/mocks/Utils/windowstatestorage.h	2016-03-29 03:47:39 +0000
+++ tests/mocks/Utils/windowstatestorage.h	2016-05-19 08:20:26 +0000
@@ -45,6 +45,9 @@
 Q_SIGNALS:
     void geometryChanged(const QVariantMap& geometry);
 
+    // For testing.
+    void stageSaved(const QString& appId, int stage);
+
 private:
     void setGeometry(const QVariantMap& geometry);
     QVariantMap geometry() const;

=== modified file 'tests/qmltests/Stages/tst_TabletStage.qml'
--- tests/qmltests/Stages/tst_TabletStage.qml	2016-04-27 15:01:10 +0000
+++ tests/qmltests/Stages/tst_TabletStage.qml	2016-05-19 08:20:26 +0000
@@ -129,6 +129,12 @@
         }
     }
 
+    SignalSpy {
+        id: stageSaver
+        target: WindowStateStorage
+        signalName: "stageSaved"
+    }
+
     UnityTestCase {
         id: testCase
         name: "TabletStage"
@@ -138,6 +144,7 @@
         property Item sideStage: tabletStage ? findChild(tabletStage, "sideStage") : null
 
         function init() {
+            stageSaver.clear();
             tabletStageLoader.active = true;
             tryCompare(tabletStageLoader, "status", Loader.Ready);
 
@@ -510,7 +517,35 @@
             tryCompare(stagesPriv, "sideStageAppId", data.sideStageAppId);
         }
 
-        function test_loadSideStageByDragginFromMainStage() {
+        function test_applicationSavesLastStage_data() {
+            return [
+                { tag: "MainStage", stage: ApplicationInfoInterface.MainStage},
+                { tag: "SideStage", stage: ApplicationInfoInterface.SideStage},
+            ];
+        }
+
+        function test_applicationSavesLastStage(data) {
+            WindowStateStorage.saveStage(webbrowserCheckBox.appId, data.stage);
+            stageSaver.clear();
+
+            var stagesPriv = findInvisibleChild(tabletStage, "stagesPriv");
+            verify(stagesPriv);
+
+            tryCompare(stagesPriv, "mainStageAppId", "unity8-dash");
+            tryCompare(stagesPriv, "sideStageAppId", "");
+
+            var webbrowserSurfaceId = topSurfaceList.nextId;
+            webbrowserCheckBox.checked = true;
+            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
+
+            webbrowserCheckBox.checked = false;
+
+            tryCompare(stageSaver, "count", 1);
+            compare(stageSaver.signalArguments[0][0], "webbrowser-app")
+            compare(stageSaver.signalArguments[0][1], data.stage)
+        }
+
+        function test_loadSideStageByDraggingFromMainStage() {
             sideStage.showNow();
             var webbrowserSurfaceId = topSurfaceList.nextId;
             webbrowserCheckBox.checked = true;
@@ -538,7 +573,7 @@
             tryCompare(appDelegate, "stage", ApplicationInfoInterface.SideStage);
         }
 
-        function test_unloadSideStageByDragginFromStageStage() {
+        function test_unloadSideStageByDraggingFromStageStage() {
             sideStage.showNow();
             WindowStateStorage.saveStage(webbrowserCheckBox.appId, ApplicationInfoInterface.SideStage)
             var webbrowserSurfaceId = topSurfaceList.nextId;
@@ -690,5 +725,34 @@
             // only unity8-dash surface is left
             compare(topSurfaceList.count, 1);
         }
+
+        function test_draggingSurfaceKeepsSurfaceFocus() {
+            var webbrowserSurfaceId = topSurfaceList.nextId;
+            webbrowserCheckBox.checked = true;
+            waitUntilAppSurfaceShowsUp(webbrowserSurfaceId);
+
+            var appDelegate = findChild(tabletStage, "spreadDelegate_" + webbrowserSurfaceId);
+            verify(appDelegate);
+            compare(appDelegate.stage, ApplicationInfoInterface.MainStage);
+
+            tryCompare(appDelegate.surface, "activeFocus", true);
+
+            var pos = tabletStage.width - sideStage.width - (tabletStage.width - sideStage.width) / 2;
+            var end_pos = tabletStage.width - sideStage.width / 2;
+
+            multiTouchDragUntil([0,1,2],
+                                tabletStage,
+                                pos,
+                                tabletStage.height / 2,
+                                units.gu(3),
+                                0,
+                                function() {
+                                    pos += units.gu(3);
+                                    return sideStage.shown && !sideStage.showAnimation.running &&
+                                           pos >= end_pos;
+                                });
+
+            tryCompare(appDelegate.surface, "activeFocus", true);
+        }
     }
 }

=== modified file 'tests/qmltests/Wizard/tst_Wizard.qml'
--- tests/qmltests/Wizard/tst_Wizard.qml	2016-04-27 15:01:10 +0000
+++ tests/qmltests/Wizard/tst_Wizard.qml	2016-05-19 08:20:26 +0000
@@ -144,7 +144,9 @@
             var pages = findChild(wizard, "wizardPages");
             var stack = findChild(pages, "pageStack");
             // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
-            tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
+            tryCompareFunction(function() { return stack.currentPage.objectName; }, name, 15000);
+            var contentAnimation = findInvisibleChild(stack.currentPage, "contentAnimation");
+            tryCompareFunction(function() { return contentAnimation.running; }, false);
             tryCompare(stack.currentPage, "opacity", 1.0);
             tryCompare(stack.currentPage, "enabled", true);
             tryCompare(stack.currentPage, "skipValid", true);
@@ -153,17 +155,6 @@
             return stack.currentPage;
         }
 
-        function verifyPageIsBlocked(name) {
-            var pages = findChild(wizard, "wizardPages");
-            var stack = findChild(pages, "pageStack");
-            // don't simply call tryCompare here, because stack.currentPage will be swapped out itself
-            tryCompareFunction(function() { return stack.currentPage.objectName; }, name);
-            tryCompare(stack.currentPage, "enabled", false);
-            tryCompare(stack.currentPage, "skipValid", false);
-            waitForRendering(stack.currentPage);
-            return stack.currentPage;
-        }
-
         function goToPage(name, skipSim, skipLocation, skipReporting) {
             if (skipSim === undefined) {
                 skipSim = false;