Merge lp:~dandrader/unity8/dashBlackFlash-lp1417967 into lp:unity8

[Daniel d'Andrada]

Darkened area behind indicators menu should eat input until it fully disappears

* 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?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1637
http://jenkins.qa.ubuntu.com/job/unity8-ci/5377/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1605
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/542
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/542
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1424
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1603
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1603/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18475

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

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * 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.
Yes, minus sad autopilot

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

review: Approve

=== modified file 'qml/Panel/IndicatorsMenu.qml'
--- qml/Panel/IndicatorsMenu.qml	2014-11-11 15:28:13 +0000
+++ qml/Panel/IndicatorsMenu.qml	2015-03-02 17:25:31 +0000
@@ -164,6 +164,7 @@
 
     DragHandle {
         id: __showDragHandle
+        objectName: "showDragHandle"
         anchors.bottom: parent.bottom
         anchors.left: parent.left
         anchors.right: parent.right

=== modified file 'qml/Panel/Panel.qml'
--- qml/Panel/Panel.qml	2015-01-26 13:48:08 +0000
+++ qml/Panel/Panel.qml	2015-03-02 17:25:31 +0000
@@ -40,10 +40,10 @@
         }
         color: "black"
         opacity: indicators.unitProgress * darkenedOpacity
+        visible: !indicators.fullyClosed
 
         MouseArea {
             anchors.fill: parent
-            enabled: indicators.shown
             onClicked: if (indicators.fullyOpened) indicators.hide();
         }
     }

=== modified file 'tests/qmltests/Panel/tst_Panel.qml'
--- tests/qmltests/Panel/tst_Panel.qml	2015-01-26 13:48:08 +0000
+++ tests/qmltests/Panel/tst_Panel.qml	2015-03-02 17:25:31 +0000
@@ -163,6 +163,16 @@
             return indicatorItem;
         }
 
+        function pullDownIndicatorsMenu() {
+            var showDragHandle = findChild(panel, "showDragHandle");
+            touchFlick(showDragHandle,
+                       showDragHandle.width / 2,
+                       showDragHandle.height / 2,
+                       showDragHandle.width / 2,
+                       showDragHandle.height / 2 + (showDragHandle.autoCompleteDragThreshold * 1.1));
+            tryCompare(panel.indicators, "fullyOpened", true);
+        }
+
         function test_drag_show_data() {
             return [
                 { tag: "pinned", fullscreen: false, call: null,
@@ -330,5 +340,47 @@
 
             compare(backgroundPressedSpy.count, 0);
         }
+
+        function test_darkenedAreaEatsAllEvents() {
+
+            // The center of the area not covered by the indicators menu
+            // Ie, the visible darkened area behind the menu
+            var touchPosX = (panel.width - panel.indicators.width) / 2
+            var touchPosY = panel.indicators.minimizedPanelHeight +
+                    ((panel.height - panel.indicators.minimizedPanelHeight) / 2)
+
+            // input goes through while the indicators menu is closed
+            tryCompare(panel.indicators, "fullyClosed", true);
+            compare(backgroundPressedSpy.count, 0);
+            tap(panel, touchPosX, touchPosY);
+            compare(backgroundPressedSpy.count, 2);
+
+            pullDownIndicatorsMenu();
+
+            // Darkened area eats input when the indicators menu is fully opened
+            tap(panel, touchPosX, touchPosY);
+            compare(backgroundPressedSpy.count, 2);
+            backgroundPressedSpy.clear();
+
+            // And should continue to eat inpunt until the indicators menu is fully closed
+            wait(10);
+            while (!panel.indicators.fullyClosed) {
+                tap(panel, touchPosX, touchPosY);
+
+                // it could have got fully closed during the tap
+                // so we have to double check here
+                if (!panel.indicators.fullyClosed) {
+                    compare(backgroundPressedSpy.count, 0);
+                }
+
+                // let the animation go a bit further
+                wait(50);
+            }
+
+            // Now that's fully closed, input should go through again
+            backgroundPressedSpy.clear();
+            tap(panel, touchPosX, touchPosY);
+            compare(backgroundPressedSpy.count, 2);
+        }
     }
 }