Unity 8

Merge lp:~mterry/unity8/no-lock-during-demo into lp:unity8

no-lock-during-demo
Merge into trunk

Proposed by Michael Terry on 2014-07-23

Status:

Merged

Approved by:

Albert Astals Cid on 2014-08-04

Approved revision:

1070

Merged at revision:

1117

Proposed branch:

lp:~mterry/unity8/no-lock-during-demo

Merge into:

lp:unity8

Diff against target:

11 lines (+1/-1)

1 file modified

qml/Shell.qml (+1/-1)

To merge this branch:

bzr merge lp:~mterry/unity8/no-lock-during-demo

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)		2014-07-23	Approve on 2014-08-04
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2014-07-30
Review via email: mp+227968@code.launchpad.net

Commit message

When the edge demo is running, don't show the greeter if the screen is turned off. This avoids an odd interaction where parts of the greeter are disabled but the edge demo isn't visible until you slide the greeter away.

Description of the change

In current unity8, when the edge demo is active (past the first screen), the user can turn off the screen, turn it back on, and then see the greeter screen. But parts of it won't be active (like the indicators or the launcher, depending on which part of the edge demo is running). When they slide across the greeter, they'll get back to the demo.

As noted in bug 1283425, this can be a little unexpected. Either we should restart the edge demo or do something that isn't confusing.

I've opted for just not locking the screen when it turns off. This isn't a security flaw since the user hasn't had a chance to set a password. And it would fit with the rest of the edge demo's disabling of features until the user has had a chance to finish it.

Remember that you can re-enable the demo with:
phablet-config edges-intro --enable

== Checklist ==

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

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-23:

FAILED: Continuous integration, rev:1068
http://jenkins.qa.ubuntu.com/job/unity8-ci/3562/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2396
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/656
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/656/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/656
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2566
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3622
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3622/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10304

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

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/no-lock-during-demo updated on 2014-07-24

1069. By Michael Terry on 2014-07-24: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-24:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-28:

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

review: Approve (continuous-integration)

lp:~mterry/unity8/no-lock-during-demo updated on 2014-07-30

1070. By Michael Terry on 2014-07-30: Merge from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-07-30:

FAILED: Continuous integration, rev:1070
http://jenkins.qa.ubuntu.com/job/unity8-ci/3677/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2704
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/771
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/771
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/771/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/771
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2812
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3947
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3947/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10663

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-08-04:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

* Did CI run pass?
Known broken tests

review: Approve

lp:~mterry/unity8/no-lock-during-demo updated on 2014-08-05

1071. By Michael Terry on 2014-08-04: Merge from trunk
1072. By Michael Terry on 2014-08-05: Merge from trunk

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/Shell.qml'
2	--- qml/Shell.qml 2014-08-05 12:06:16 +0000
3	+++ qml/Shell.qml 2014-08-05 18:20:25 +0000
4	@@ -400,7 +400,7 @@
5	onDisplayPowerStateChange: {
6	// We ignore any display-off signals when the proximity sensor
7	// is active. This usually indicates something like a phone call.
8	- if (status == Powerd.Off && reason != Powerd.Proximity) {
9	+ if (status == Powerd.Off && reason != Powerd.Proximity && !edgeDemo.running) {
10	greeter.showNow();
11	}
12