Unity 8

Merge lp:~mterry/unity8/relock-during-tutorial into lp:unity8

relock-during-tutorial
Merge into trunk

Proposed by Michael Terry on 2016-02-10

Status:	Rejected
Rejected by:	Michael Terry on 2016-03-24
Proposed branch:	lp:~mterry/unity8/relock-during-tutorial
Merge into:	lp:unity8
Diff against target:	282 lines (+63/-47) 9 files modified qml/Greeter/Greeter.qml (+14/-7) qml/Shell.qml (+2/-2) qml/Tutorial/TutorialContent.qml (+1/-0) qml/Tutorial/TutorialLeft.qml (+5/-3) qml/Tutorial/TutorialLeftFinish.qml (+5/-0) tests/qmltests/Greeter/tst_Greeter.qml (+7/-1) tests/qmltests/Tutorial/tst_Tutorial.qml (+9/-5) tests/qmltests/tst_Shell.qml (+20/-7) tests/qmltests/tst_ShellWithPin.qml (+0/-22)
To merge this branch:	bzr merge lp:~mterry/unity8/relock-during-tutorial
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-24
Michał Sawicz			Needs Fixing on 2016-02-24
PS Jenkins bot	continuous-integration		Needs Fixing on 2016-02-22
Albert Astals Cid (community)		2016-02-10	Approve on 2016-02-22
Review via email: mp+285631@code.launchpad.net

Commit Message

Don't keep greeter unlocked while tutorial is running, only while wizard is running. This lets you lock your screen again during the tutorial.

Description of the Change

This is a backported fix from the stuck-in-development-hell tutorial-redesign branch.

- The Greeter.qml changes are to actually hide the lockscreen & greeter when forced to unlock. This makes sure it stays hidden even after the forcedUnlock hold is released. This also involves a UI change -- the cover page is no longer shown after the wizard. But that's desired by Design (part of the tutorial redesign). So I'm just pulling it forward a bit before the rest of the design:
https://docs.google.com/document/d/1pZ-Ro--2eaRzjZKNRoYAeDvQHMkCuyvVuPFWFQfPW4s/edit#heading=h.63dlt3i5leh

- The Shell.qml changes are to allow the screen to be locked even though the tutorial is running (but still not when the wizard is running).

- The TutorialLeft.qml changes are to avoid the launcher being stuck in a pulled-out state when the greeter is locked during the tutorial.

* 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?
NA

* If you changed the UI, has there been a design review?
No, but it's a simple change requested by them.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-11:

What's the reason for the changes in qml/Tutorial/TutorialLeft.qml ? Seem a bit unrelated to me at first sight?

Also, lots of failing tests.

review: Needs Information

Michael Terry (mterry) wrote on 2016-02-11:

The reason for the TutorialLeft changes is that now that a user can lock the screen, if the launcher is bouncing out when the user locks it, it can get stuck that way (visible on lockscreen). This just makes sure that when the tutorial is paused (i.e. the lockscreen is up), we reset the animation to 0.

Failing tests due to this branch? I'll investigate and see what's up.

Michael Terry (mterry) wrote on 2016-02-11:

OK, I think I fixed the tests (they had previously used a user with a pin set which hadn't mattered since the lockscreen was skipped during the tutorial, but now it does matter, so I switched to a user without a pin).

Plus, I fixed one test and some logic to keep the animation correctly paused while a user drags the launcher.

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

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-11:

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-02-12:

OK, pulled a little bit more from the tutorial-redesign, in order to fix the rest of the tests and keep internal Greeter state more consistent after the wizard closes.

See the MP description for a bit more explanation of the changes.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-12:

FAILED: Continuous integration, rev:2180
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/344/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/469/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/492
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/510
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/510
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/506/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/506/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/506/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/506/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/506/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/506/console

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-12:

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-12:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-12:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-15:

If i lock the screen after doing the pull of the launcher i.e. in the "There are the shortcuts to favorite apps" step, the launcher is not shown after unlokcing, i guess we should fix this? What do you think?

review: Needs Fixing

Michael Terry (mterry) wrote on 2016-02-17:

Great point, didn't notice that. Fixed in this branch by re-showing the launcher in this case.

May look *slightly* odd to see it animating in, but it looked better to me than instantly showing it on the screen. And (a) this whole tutorial is temporary, to be replaced soon and (b) this is an odd case.

So I didn't feel like optimizing.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

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

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-22:

* 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

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

review: Approve

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

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

review: Approve (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-22:

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

review: Needs Fixing (continuous-integration)

Michał Sawicz (saviq) wrote on 2016-02-24:

This breaks:
unity8.shell.tests.test_tutorial.TutorialTestCase.test_complete_tutorial

https://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/5013/

review: Needs Fixing

Albert Astals Cid (aacid) wrote on 2016-03-24:

Text conflict in qml/Greeter/Greeter.qml
Text conflict in qml/Tutorial/TutorialContent.qml
Text conflict in qml/Tutorial/TutorialLeft.qml
Contents conflict in qml/Tutorial/TutorialLeftFinish.qml
Text conflict in tests/qmltests/Tutorial/tst_Tutorial.qml
5 conflicts encountered.

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

FAILED: Continuous integration, rev:2183
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/845/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1093/console

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

review: Needs Fixing (continuous-integration)

Michael Terry (mterry) wrote on 2016-03-24:

Oh, we don't need this anymore, since tutorial-redesign landed. I'll mark this MP rejected.

Unmerged revisions

2183. By Michael Terry on 2016-02-22: Merge from trunk
2182. By Michael Terry on 2016-02-17: Show launcher in LeftFinish screen after a lock/unlock
2181. By Michael Terry on 2016-02-12: Fix whitespace
2180. By Michael Terry on 2016-02-12: Actually tear down greeter when force unlocked (to keep it unlocked until shown)
2179. By Michael Terry on 2016-02-11: Fix tests
2178. By Michael Terry on 2016-02-10: Allow re-locking screen even if tutorial is running

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 Terry

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'qml/Greeter/Greeter.qml'
2	--- qml/Greeter/Greeter.qml 2016-01-11 17:37:02 +0000
3	+++ qml/Greeter/Greeter.qml 2016-02-22 13:27:59 +0000
4	@@ -160,6 +160,14 @@
5	return false;
6	}
7	}
8	+
9	+ function checkForcedUnlock() {
10	+ if (forcedUnlock && shown && loader.item) {
11	+ // pretend we were just authenticated
12	+ loader.item.notifyAuthenticationSucceeded();
13	+ loader.item.hide();
14	+ }
15	+ }
16	}
17
18	onLauncherOffsetChanged: {
19	@@ -168,13 +176,6 @@
20	}
21	}
22
23	- onForcedUnlockChanged: {
24	- if (forcedUnlock && shown) {
25	- // pretend we were just authenticated
26	- loader.item.notifyAuthenticationSucceeded();
27	- }
28	- }
29	-
30	onRequiredChanged: {
31	if (required) {
32	d.waiting = true;
33	@@ -182,6 +183,12 @@
34	}
35	}
36
37	+ onForcedUnlockChanged: d.checkForcedUnlock()
38	+
39	+ Component.onCompleted: {
40	+ d.checkForcedUnlock();
41	+ }
42	+
43	GSettings {
44	id: greeterSettings
45	schema.id: "com.canonical.Unity8.Greeter"
46
47	=== modified file 'qml/Shell.qml'
48	--- qml/Shell.qml 2016-01-28 18:25:14 +0000
49	+++ qml/Shell.qml 2016-02-22 13:27:59 +0000
50	@@ -405,7 +405,7 @@
51	hides: [launcher, panel.indicators]
52	tabletMode: shell.usageScenario != "phone"
53	launcherOffset: launcher.progress
54	- forcedUnlock: tutorial.running
55	+ forcedUnlock: wizard.active
56	background: wallpaperResolver.background
57
58	// avoid overlapping with Launcher's edge drag area
59	@@ -462,7 +462,7 @@
60
61	onStatusChanged: {
62	if (Powerd.status === Powerd.Off && reason !== Powerd.Proximity &&
63	- !callManager.hasCalls && !tutorial.running) {
64	+ !callManager.hasCalls && !wizard.active) {
65	// We don't want to simply call greeter.showNow() here, because
66	// that will take too long. Qt will delay button event
67	// handling until the greeter is done loading and may think the
68
69	=== modified file 'qml/Tutorial/TutorialContent.qml'
70	--- qml/Tutorial/TutorialContent.qml 2015-08-25 07:25:26 +0000
71	+++ qml/Tutorial/TutorialContent.qml 2016-02-22 13:27:59 +0000
72	@@ -76,6 +76,7 @@
73	objectName: "tutorialLeftFinish"
74	anchors.fill: parent
75	textXOffset: root.launcher.panelWidth
76	+ launcher: root.launcher
77	paused: !shown \|\| root.paused
78	text: i18n.tr("Tap here to continue.")
79
80
81	=== modified file 'qml/Tutorial/TutorialLeft.qml'
82	--- qml/Tutorial/TutorialLeft.qml 2015-07-21 14:38:35 +0000
83	+++ qml/Tutorial/TutorialLeft.qml 2016-02-22 13:27:59 +0000
84	@@ -29,7 +29,7 @@
85	textXOffset: root.launcher.x + root.launcher.visibleWidth
86
87	Connections {
88	- target: root.launcher
89	+ target: root.shown ? root.launcher : null
90
91	onStateChanged: {
92	if (root.launcher.state === "visible") {
93	@@ -47,12 +47,14 @@
94	SequentialAnimation {
95	id: teaseAnimation
96	objectName: "teaseAnimation"
97	- paused: running && root.paused
98	- running: !slider.active && root.launcher.visibleWidth === 0 && root.shown
99	+ paused: running && (slider.active \|\| root.launcher.visibleWidth > 0)
100	+ running: !root.paused && root.shown
101	loops: Animation.Infinite
102	property real bounce: 0
103	readonly property real maxBounce: units.gu(2)
104
105	+ onRunningChanged: bounce = 0
106	+
107	UbuntuNumberAnimation {
108	target: teaseAnimation
109	property: "bounce"
110
111	=== modified file 'qml/Tutorial/TutorialLeftFinish.qml'
112	--- qml/Tutorial/TutorialLeftFinish.qml 2015-07-15 15:07:19 +0000
113	+++ qml/Tutorial/TutorialLeftFinish.qml 2016-02-22 13:27:59 +0000
114	@@ -21,10 +21,15 @@
115	TutorialPage {
116	id: root
117
118	+ property var launcher
119	+
120	title: i18n.tr("These are the shortcuts to favorite apps")
121	text: i18n.tr("Tap here to continue.")
122	fullTextWidth: true
123
124	+ // Make sure launcher is shown, even after screen is locked/unlocked
125	+ onPausedChanged: if (!paused) launcher.switchToNextState("visible")
126	+
127	foreground {
128	children: [
129	LocalComponents.Tick {
130
131	=== modified file 'tests/qmltests/Greeter/tst_Greeter.qml'
132	--- tests/qmltests/Greeter/tst_Greeter.qml 2016-01-11 17:37:02 +0000
133	+++ tests/qmltests/Greeter/tst_Greeter.qml 2016-02-22 13:27:59 +0000
134	@@ -328,9 +328,15 @@
135	LightDM.Greeter.active = true;
136
137	greeter.forcedUnlock = true;
138	- compare(view.locked, false);
139	+ compare(greeter.required, false);
140	greeter.forcedUnlock = false;
141
142	+ // Now recover from tearing down the view above
143	+ LightDM.Greeter.showGreeter();
144	+ tryCompare(greeter, "required", true);
145	+ tryCompare(greeter, "waiting", false);
146	+ view = findChild(greeter, "testView");
147	+
148	selectUser("no-password");
149	tryCompare(view, "locked", false);
150	selectUser("has-password");
151
152	=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
153	--- tests/qmltests/Tutorial/tst_Tutorial.qml 2015-09-02 07:42:27 +0000
154	+++ tests/qmltests/Tutorial/tst_Tutorial.qml 2016-02-22 13:27:59 +0000
155	@@ -47,8 +47,8 @@
156
157	Component.onCompleted: {
158	// must set the mock mode before loading the Shell
159	- LightDM.Greeter.mockMode = "single-pin";
160	- LightDM.Users.mockMode = "single-pin";
161	+ LightDM.Greeter.mockMode = "single";
162	+ LightDM.Users.mockMode = "single";
163	shellLoader.active = true;
164	}
165
166	@@ -331,24 +331,28 @@
167
168	// Wait for launcher to be really out there
169	tryCompareFunction(function() {return launcher.x > teaseAnimation.maxBounce/2}, true);
170	+ verify(!teaseAnimation.paused);
171	verify(teaseAnimation.running);
172
173	// Start a drag, make sure animation stops
174	touchFlick(shell, 0, halfHeight, units.gu(4), halfHeight, true, false);
175	- verify(!teaseAnimation.running);
176	+ verify(teaseAnimation.paused);
177	+ verify(teaseAnimation.running);
178	verify(launcher.visibleWidth > 0);
179	verify(launcher.x > 0);
180	compare(launcher.x, teaseAnimation.bounce);
181
182	// Continue drag, make sure we don't create a gap on the left hand side
183	touchFlick(shell, units.gu(4), halfHeight, shell.width, halfHeight, false, false);
184	- verify(!teaseAnimation.running);
185	+ verify(teaseAnimation.paused);
186	+ verify(teaseAnimation.running);
187	compare(launcher.visibleWidth, launcher.panelWidth);
188	compare(launcher.x, 0);
189
190	// Finish and make sure we continue animation
191	touchFlick(shell, shell.width, halfHeight, shell.width, halfHeight, false, true);
192	- tryCompare(teaseAnimation, "running", true);
193	+ tryCompare(teaseAnimation, "paused", false);
194	+ verify(teaseAnimation.running);
195	}
196
197	function test_spread() {
198
199	=== modified file 'tests/qmltests/tst_Shell.qml'
200	--- tests/qmltests/tst_Shell.qml 2016-02-12 00:11:28 +0000
201	+++ tests/qmltests/tst_Shell.qml 2016-02-22 13:27:59 +0000
202	@@ -565,9 +565,8 @@
203
204	function test_tabletLeftEdgeDrag_data() {
205	return [
206	- {tag: "without password", user: "no-password", loggedIn: true, demo: false},
207	- {tag: "with password", user: "has-password", loggedIn: false, demo: false},
208	- {tag: "with demo", user: "has-password", loggedIn: true, demo: true},
209	+ {tag: "without password", user: "no-password", loggedIn: true},
210	+ {tag: "with password", user: "has-password", loggedIn: false},
211	]
212	}
213
214	@@ -577,10 +576,6 @@
215
216	selectUser(data.user)
217
218	- AccountsService.demoEdges = data.demo
219	- var tutorial = findChild(shell, "tutorial");
220	- tryCompare(tutorial, "running", data.demo);
221	-
222	swipeFromLeftEdge(shell.width * 0.75)
223	wait(500) // to give time to handle dash() signal from Launcher
224	confirmLoggedIn(data.loggedIn)
225	@@ -1170,6 +1165,24 @@
226	compare(tutorialLeft, null); // should be destroyed with tutorial
227	}
228
229	+ function test_wizardHidesGreeter() {
230	+ setLightDMMockMode("single-pin");
231	+ loadShell("phone");
232	+
233	+ var wizard = findChild(shell, "wizard");
234	+ var greeter = findChild(shell, "greeter");
235	+
236	+ Wizard.System.wizardEnabled = true;
237	+ verify(wizard.active);
238	+ tryCompare(greeter, "shown", false);
239	+
240	+ Wizard.System.wizardEnabled = false;
241	+ verify(!wizard.active);
242	+ verify(!greeter.shown); // stays hidden
243	+
244	+ compare(sessionSpy.count, 1);
245	+ }
246	+
247	function test_tutorialPausedDuringGreeter() {
248	loadShell("phone");
249
250
251	=== modified file 'tests/qmltests/tst_ShellWithPin.qml'
252	--- tests/qmltests/tst_ShellWithPin.qml 2016-01-19 19:46:01 +0000
253	+++ tests/qmltests/tst_ShellWithPin.qml 2016-02-22 13:27:59 +0000
254	@@ -270,28 +270,6 @@
255	tryCompare(sessionSpy, "count", 1)
256	}
257
258	- function test_edgeDemoHidesLockscreen() {
259	- LightDM.Greeter.showGreeter()
260	- sessionSpy.clear()
261	- var lockscreen = findChild(shell, "lockscreen")
262	-
263	- tryCompare(lockscreen, "shown", true)
264	- AccountsService.demoEdges = true
265	- tryCompare(lockscreen, "shown", false)
266	-
267	- var greeter = findChild(shell, "greeter");
268	- swipeAwayGreeter(false);
269	- tryCompare(greeter, "shown", false);
270	- tryCompare(sessionSpy, "count", 1)
271	-
272	- // Lockscreen is only hidden by the edge demo, so if we turn that
273	- // off and show greeter again, lockscreen should appear
274	- AccountsService.demoEdges = false
275	- LightDM.Greeter.showGreeter()
276	- lockscreen = findChild(shell, "lockscreen");
277	- tryCompare(lockscreen, "shown", true)
278	- }
279	-
280	function test_disabledEdges() {
281	var launcher = findChild(shell, "launcher")
282	tryCompare(launcher, "available", true)