Merge lp:~mzanetti/unity8/tryShell-edgepush into lp:unity8

[Michael Zanetti]

add left/right edge barrier controllers to tryShell

 * Are there any related MPs required for this MP to build/function as expected? Please list.
n0
 * Did you perform an exploratory manual test run of your code change and any related functionality?
y3s
 * 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

[lp:~mzanetti/unity8/tryShell-edgepush]

2802. By Michael Zanetti on 2017-01-30

cleanup

2803. By Michael Zanetti on 2017-01-30

more cleanup

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2803
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3075/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3998
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2342
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2342
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4026
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3870/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3870/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3870/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3870/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3870/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3870
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3870/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3075/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/unity8/tryShell-edgepush]

2804. By Michael Zanetti on 2017-01-30

drop show launcher button, it's not needed any more

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2804
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3076/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/3999/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4027
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3871
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3871/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3871
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3871/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3871
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3871/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3871/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3871
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3871/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3871
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3871/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3076/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2804
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3082/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4006
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2346
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2346
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4034
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3878/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3878/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3878/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3878/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3878/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3878
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3878/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3082/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

This is an improvement but still has the problem of just showing the launcher being impossible, since if you have it in autohide it will immediately hide because the mouse is not ovet the launcher, can you think of a way we could fix that?

review: Needs Information

[Michael Zanetti (mzanetti)]

> This is an improvement but still has the problem of just showing the launcher
> being impossible, since if you have it in autohide it will immediately hide
> because the mouse is not ovet the launcher, can you think of a way we could
> fix that?

Daniel is about to finish his testWithQtMir branch. With that, edge pushes in trySomething will start working for real, so I guess this branch is off the table now anyways... I suppose that branch will have the same issue though (mouse not hovering the launcher even though edge push works).
We should try to find a solution for that on top of the other branch.

Unmerged revisions

2804. By Michael Zanetti on 2017-01-30

drop show launcher button, it's not needed any more

2803. By Michael Zanetti on 2017-01-30

more cleanup

2802. By Michael Zanetti on 2017-01-30

cleanup

2801. By Michael Zanetti on 2017-01-30

add left/right edge push controllers to tryShell

=== modified file 'tests/qmltests/tst_Shell.qml'
--- tests/qmltests/tst_Shell.qml	2017-01-24 07:43:54 +0000
+++ tests/qmltests/tst_Shell.qml	2017-01-30 12:40:40 +0000
@@ -35,6 +35,7 @@
 import Wizard 0.1 as Wizard
 import Utils 0.1
 import Unity.Indicators 0.1 as Indicators
+import Ubuntu.Components.ListItems 1.3
 
 import "../../qml"
 import "../../qml/Components"
@@ -128,7 +129,7 @@
                 Shell {
                     id: __shell
                     objectName: "shell"
-                    usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]
+                    usageScenario: usageScenarioSelector.values[usageScenarioSelector.selectedIndex]
                     nativeWidth: width
                     nativeHeight: height
                     orientation: shellLoader.shellOrientation
@@ -208,17 +209,6 @@
                         }
                     }
                     Button {
-                        text: "Show Launcher"
-                        activeFocusOnPress: false
-                        onClicked: {
-                            if (shellLoader.status !== Loader.Ready)
-                                return;
-
-                            var launcher = testCase.findChild(shellLoader.item, "launcher");
-                            launcher.state = "visible";
-                        }
-                    }
-                    Button {
                         text: "Print focused"
                         activeFocusOnPress: false
                         onClicked: {
@@ -238,56 +228,36 @@
                         }
                     }
                 }
-                Label {
-                    text: "LightDM mock mode"
-                }
 
-                ListItem.ItemSelector {
-                    anchors { left: parent.left; right: parent.right }
-                    activeFocusOnPress: false
-                    model: ["single", "single-passphrase", "single-pin", "full"]
+                ValueSelector {
+                    text: "LightDM:"
+                    values: ["single", "single-passphrase", "single-pin", "full"]
                     onSelectedIndexChanged: {
                         testCase.tearDown();
-                        LightDMController.userMode = model[selectedIndex];
+                        LightDMController.userMode = values[selectedIndex];
                         shellLoader.active = true;
                     }
                 }
-                Label {
+
+                ValueSelector {
+                    id: sizeSelector
                     text: "Size"
-                }
-
-                ListItem.ItemSelector {
-                    id: sizeSelector
-                    anchors { left: parent.left; right: parent.right }
-                    activeFocusOnPress: false
-                    model: ["phone", "tablet", "desktop"]
+                    values: ["phone", "tablet", "desktop"]
                     onSelectedIndexChanged: {
-                        shellLoader.state = model[selectedIndex];
+                        shellLoader.state = values[selectedIndex];
                     }
                 }
-                Label {
+
+                ValueSelector {
+                    id: usageScenarioSelector
                     text: "Usage scenario"
-                }
-
-                ListItem.ItemSelector {
-                    id: usageScenarioSelector
-                    anchors { left: parent.left; right: parent.right }
-                    activeFocusOnPress: false
-                    model: ["phone", "tablet", "desktop"]
-                }
-                MouseTouchEmulationCheckbox {
-                    id: mouseEmulation
-                    checked: true
-                }
-                Label {
+                    values: ["phone", "tablet", "desktop"]
+
+                }
+
+                ValueSelector {
                     text: "Ctrl key as"
-                }
-
-                ListItem.ItemSelector {
-                    id: ctrlModifier
-                    anchors { left: parent.left; right: parent.right }
-                    activeFocusOnPress: false
-                    model: ["Ctrl", "Alt", "Super"]
+                    values: ["Ctrl", "Alt", "Super"]
                     onSelectedIndexChanged: {
                         var keyMapper = testCase.findChild(shellContainer, "physicalKeysMapper");
                         keyMapper.controlInsteadOfAlt = selectedIndex == 1;
@@ -295,6 +265,37 @@
                     }
                 }
 
+                MouseTouchEmulationCheckbox {
+                    id: mouseEmulation
+                    checked: true
+                }
+
+                EdgeBarrierControls {
+                    id: edgeBarrierControls
+                    text: "Drag for left edge push"
+                    width: parent.width
+                    Component.onCompleted: {
+                        var launcher = testCase.findChild(shellContainer, "launcher");
+                        target = testCase.findChild(launcher, "edgeBarrierController");
+                    }
+                    onDragged: {
+                        var launcher = testCase.findChild(shellContainer, "launcher");
+                        launcher.pushEdge(amount);
+                    }
+                }
+                EdgeBarrierControls {
+                    text: "Drag for right edge push"
+                    width: parent.width
+                    Component.onCompleted: {
+                        var stage = testCase.findChild(shellContainer, "stage");
+                        target = testCase.findChild(stage, "edgeBarrierController");
+                    }
+                    onDragged: {
+                        var stage = testCase.findChild(shellContainer, "stage");
+                        stage.pushRightEdge(amount);
+                    }
+                }
+
                 Row {
                     anchors { left: parent.left; right: parent.right }
                     CheckBox {