Merge lp:~cimi/unity8/fix-1368778-2 into lp:unity8

[Andrea Cimitan]

Remove dismiss timer in Launcher

 * 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?
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?
n/a
 * If you changed the UI, has there been a design review?
y

[lp:~cimi/unity8/fix-1368778-2]

1452. By Andrea Cimitan on 2014-11-26

Add comment

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1451
http://jenkins.qa.ubuntu.com/job/unity8-ci/4984/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/379
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16282

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1452
http://jenkins.qa.ubuntu.com/job/unity8-ci/4986/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/382
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/163
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/151
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/151
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/344
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/382
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/382/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16287

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

FAIL! : qmltestrunner::Shell::test_tapUbuntuIconInLauncherOverAppSpread() Uncaught exception: Type error
   Loc: [/tmp/buildd/unity8-8.01+15.04.20141125.2bzr1453pkg0vivid163/tests/qmltests/tst_Shell.qml(750)]

review: Needs Fixing

[lp:~cimi/unity8/fix-1368778-2]

1453. By Andrea Cimitan on 2014-12-01

Comment out another piece

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1453
http://jenkins.qa.ubuntu.com/job/unity8-ci/4994/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/171
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/365
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/415
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/415/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16347

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

Instead of creating all that comments mess, can't we just add a property bool autohideEnabled at the top, and only start the timer if that property is true?

review: Needs Information

[lp:~cimi/unity8/fix-1368778-2]

1454. By Andrea Cimitan on 2014-12-05

With property

[Michael Zanetti (mzanetti)]

ok. change looks good to me now. It's working fine. I think the thing in the tests can be deleted. If something like this would be required again, the new way would be to set autohideEnabled to false.

review: Needs Fixing

[lp:~cimi/unity8/fix-1368778-2]

1455. By Andrea Cimitan on 2014-12-08

Removed piece in a test

[Michael Zanetti (mzanetti)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yes

 * Did CI run pass? If not, please explain why.

hmm... seems to be on a break

 * Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

=== modified file 'qml/Launcher/Launcher.qml'
--- qml/Launcher/Launcher.qml	2014-11-19 17:43:09 +0000
+++ qml/Launcher/Launcher.qml	2014-12-08 12:12:56 +0000
@@ -23,6 +23,7 @@
 Item {
     id: root
 
+    property bool autohideEnabled: false
     property bool available: true // can be used to disable all interactions
 
     property int panelWidth: units.gu(8)
@@ -88,10 +89,12 @@
         objectName: "dismissTimer"
         interval: 5000
         onTriggered: {
-            if (!panel.preventHiding) {
-                root.state = ""
-            } else {
-                dismissTimer.restart()
+            if (root.autohideEnabled) {
+                if (!panel.preventHiding) {
+                    root.state = ""
+                } else {
+                    dismissTimer.restart()
+                }
             }
         }
     }

=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
--- tests/qmltests/Launcher/tst_Launcher.qml	2014-11-10 10:10:34 +0000
+++ tests/qmltests/Launcher/tst_Launcher.qml	2014-12-08 12:12:56 +0000
@@ -118,11 +118,6 @@
 
             // Now do check that snapping is in fact enabled
             compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
-
-            // Tests can be run in a reaaaaally slow environment or machine. Thus ensure
-            // the dismissTimer doesn't time out inadvertently.
-            var dismissTimer = findInvisibleChild(launcher, "dismissTimer");
-            dismissTimer.interval = 60 * 60 * 1000; // one hour
         }
 
         function dragLauncherIntoView() {