Unity 8

Merge lp:~mzanetti/unity8/disable-spread-while-locked into lp:unity8

disable-spread-while-locked
Merge into trunk

Proposed by Michael Zanetti on 2016-11-22

Status:

Merged

Approved by:

Lukáš Tinkl on 2016-11-22

Approved revision:

2701

Merged at revision:

2715

Proposed branch:

lp:~mzanetti/unity8/disable-spread-while-locked

Merge into:

lp:unity8

Prerequisite:

lp:~bhdouglass/unity8/disable-indicator-menu

Diff against target:

110 lines (+54/-4)

3 files modified

qml/Shell.qml (+0/-2)
qml/Stage/Stage.qml (+8/-2)
tests/qmltests/tst_Shell.qml (+46/-0)

To merge this branch:

bzr merge lp:~mzanetti/unity8/disable-spread-while-locked

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-11-22	Approve on 2016-11-24
Lukáš Tinkl (community)		2016-11-22	Approve on 2016-11-22
Review via email: mp+311515@code.launchpad.net

This proposal supersedes a proposal from 2016-11-14.

Commit Message

disable spread interaction while locked

Description of the Change

* 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
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
no
* If you changed the UI, has there been a design review?
no

Lukáš Tinkl (lukas-kde) wrote on 2016-11-14: Posted in a previous version of this proposal

Change looks and works fine; tested on my krillin with mouse edge push, alt-tab and Meta+W keyboard shortcut

* 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.

Not yet, will wait with the top approval

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-14: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-14: Posted in a previous version of this proposal

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

review: Approve (continuous-integration)

lp:~mzanetti/unity8/disable-spread-while-locked updated on 2016-11-22

2701. By Michael Zanetti on 2016-11-22: fix bad merge

Lukáš Tinkl (lukas-kde) wrote on 2016-11-22:

Ok, looks good

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-22:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-23:

FAILED: Continuous integration, rev:2700
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2531/
Executed test runs:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-23:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-11-24:

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Michael Zanetti

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2016-11-22 17:01:17 +0000
 +++ qml/Shell.qml	2016-11-22 17:01:17 +0000
@@ -311,8 +311,6 @@
              keepDashRunning: launcher.shown || launcher.dashSwipe
              altTabPressed: physicalKeysMapper.altTabPressed
              oskEnabled: shell.oskEnabled
--
--            // TODO: This is not implemented yet in the new stage...
              spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))
+         }
+     }
 === modified file 'qml/Stage/Stage.qml'
 --- qml/Stage/Stage.qml	2016-11-12 16:05:40 +0000
 +++ qml/Stage/Stage.qml	2016-11-22 17:01:17 +0000
@@ -92,7 +92,9 @@
      onAltTabPressedChanged: {
          if (altTabPressed) {
--            altTabDelayTimer.start();
++            if (root.spreadEnabled) {
++                altTabDelayTimer.start();
++            }
          } else {
              // Alt Tab has been released, did we already go to spread?
              if (priv.goneToSpread) {
@@ -127,7 +129,9 @@
      function updateFocusedAppOrientation() { /* TODO */ }
      function updateFocusedAppOrientationAnimated() { /* TODO */}
      function pushRightEdge(amount) {
--        edgeBarrier.push(amount);
++        if (root.spreadEnabled) {
++            edgeBarrier.push(amount);
++        }
+     }
      function closeSpread() {
@@ -168,6 +172,7 @@
      GlobalShortcut {
          id: showSpreadShortcut
          shortcut: Qt.MetaModifier|Qt.Key_W
++        active: root.spreadEnabled
          onTriggered: priv.goneToSpread = true
+     }
@@ -1788,6 +1793,7 @@
          direction: Direction.Leftwards
          anchors { top: parent.top; right: parent.right; bottom: parent.bottom }
          width: root.dragAreaWidth
++        enabled: root.spreadEnabled
          property var gesturePoints: []
          property bool cancelled: false
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2016-11-22 17:01:17 +0000
 +++ tests/qmltests/tst_Shell.qml	2016-11-22 17:01:17 +0000
@@ -2797,5 +2797,51 @@
              GSettingsController.setEnableIndicatorMenu(true);
+         }
++
++        function test_spreadDisabled_data() {
++            return [
++                { tag: "enabled", spreadEnabled: true },
++                { tag: "disabled", spreadEnabled: false }
++            ];
++        }
++
++        function test_spreadDisabled(data) {
++            loadShell("phone");
++            swipeAwayGreeter();
++            var stage = findChild(shell, "stage");
++            stage.spreadEnabled = data.spreadEnabled;
++
++            // Try swiping
++            touchFlick(shell, shell.width - 2, shell.height / 2, units.gu(1), shell.height / 2);
++            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
++
++            stage.closeSpread();
++            tryCompare(stage, "state", "staged");
++
++            // Try by edge push
++            mouseMove(stage, stage.width -  1, units.gu(10));
++            for (var i = 0; i < units.gu(10); i++) {
++                stage.pushRightEdge(1);
++            }
++            mouseMove(stage, stage.width - units.gu(5), units.gu(10));
++            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
++
++            stage.closeSpread();
++            tryCompare(stage, "state", "staged");
++
++            // Try by alt+tab
++            keyPress(Qt.Key_Alt);
++            keyClick(Qt.Key_Tab);
++            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
++            keyRelease(Qt.Key_Alt);
++
++            stage.closeSpread();
++            tryCompare(stage, "state", "staged");
++
++            // Try by Super+W
++            keyPress(Qt.Key_W, Qt.MetaModifier)
++            tryCompare(stage, "state", data.spreadEnabled ? "spread" : "staged");
++            keyRelease(Qt.Key_W, Qt.MetaModifier)
++        }
+     }
+ }