Merge lp:~saviq/unity8/fix-edges-demo into lp:unity8

[Michał Sawicz]

Fix edges demo, drop underlay as it was never visible any more.

 * 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?
N/A

[Michael Terry (mterry)]

Comments inline.

review: Needs Fixing

[Michael Terry (mterry)]

Marking this rejected, in favor of lp:~mterry/unity8/dash-app-demo-fixes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/unity8-ci/3795/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/889
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/889/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/889
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4351
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11092

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

review: Approve (continuous-integration)

Unmerged revisions

1115. By Michał Sawicz on 2014-08-06

Fix demo edges, remove underlay which was never visible any more.

=== modified file 'qml/Components/EdgeDemo.qml'
--- qml/Components/EdgeDemo.qml	2014-07-23 10:16:29 +0000
+++ qml/Components/EdgeDemo.qml	2014-08-06 12:52:33 +0000
@@ -24,13 +24,12 @@
     property Item greeter
     property Item launcher
     property Item indicators
-    property Item underlay
+    property Item stages
 
     property bool launcherEnabled: true
-    property bool dashEnabled: true
     property bool panelEnabled: true
     property bool panelContentEnabled: true
-    property bool running: !launcherEnabled || !dashEnabled || !panelEnabled || !panelContentEnabled
+    property bool running: !launcherEnabled || !panelEnabled || !panelContentEnabled
 
     property bool paused: false
 
@@ -58,7 +57,6 @@
 
     function stopDemo() {
         launcherEnabled = true
-        dashEnabled = true
         panelEnabled = true
         panelContentEnabled = true
         if (d.rightEdgeDemo)  d.rightEdgeDemo.destroy()
@@ -74,11 +72,10 @@
         }
 
         launcherEnabled = false;
-        dashEnabled = false;
         panelEnabled = false;
         panelContentEnabled = false;
 
-        // Begin with either greeter or dash, depending on which is visible
+        // Begin with either greeter or top, depending on which is visible
         if (greeter && greeter.shown) {
             startRightEdgeDemo()
         } else {
@@ -138,12 +135,12 @@
 
     function startTopEdgeDemo() {
         demo.panelEnabled = true;
-        if (demo.dash && demo.underlay) {
-            d.topEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.topEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "top",
                 "title": i18n.tr("Top edge"),
                 "text": i18n.tr("Try swiping from the top edge to access the indicators"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
             });
         }
         if (d.topEdgeDemo) {
@@ -192,12 +189,12 @@
     function startLeftEdgeDemo() {
         demo.panelEnabled = false;
         demo.launcherEnabled = true;
-        if (demo.underlay) {
-            d.leftEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.leftEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "left",
                 "title": i18n.tr("Left edge"),
                 "text": i18n.tr("Swipe from the left to reveal the launcher for quick access to apps"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
             });
         }
         if (d.leftEdgeDemo) {
@@ -220,12 +217,12 @@
 
     function startFinalEdgeDemo() {
         demo.launcherEnabled = false;
-        if (demo.underlay) {
-            d.finalEdgeDemo = d.overlay.createObject(demo.underlay, {
+        if (demo.stages) {
+            d.finalEdgeDemo = d.overlay.createObject(demo.stages, {
                 "edge": "none",
                 "title": i18n.tr("Well done"),
                 "text": i18n.tr("You have now mastered the edge gestures and can start using the phone<br><br>Tap on the screen to start"),
-                "anchors.fill": demo.underlay,
+                "anchors.fill": demo.stages,
                 "showSkip": false,
             });
         }

=== modified file 'qml/Shell.qml'
--- qml/Shell.qml	2014-08-05 12:06:16 +0000
+++ qml/Shell.qml	2014-08-06 12:52:33 +0000
@@ -113,25 +113,6 @@
     }
 
     Item {
-        id: underlay
-        objectName: "underlay"
-        anchors.fill: parent
-
-        // Whether the underlay is fully covered by opaque UI elements.
-        property bool fullyCovered: (panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth)
-                                        || stages.fullyShown || greeterWrapper.fullyShown
-        visible: !fullyCovered
-
-        Image {
-            anchors.fill: underlay
-            source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"
-            fillMode: Image.PreserveAspectCrop
-            horizontalAlignment: Image.AlignRight
-            verticalAlignment: Image.AlignTop
-        }
-    }
-
-    Item {
         id: stages
         objectName: "stages"
         width: parent.width
@@ -580,7 +561,7 @@
         greeter: greeter
         launcher: launcher
         indicators: panel.indicators
-        underlay: underlay
+        stages: stages
     }
 
     Connections {