Merge lp://qastaging/~mterry/unity8/relock-during-tutorial into lp://qastaging/unity8
| Status: | Rejected |
|---|---|
| Rejected by: | Michael Terry |
| Proposed branch: | lp://qastaging/~mterry/unity8/relock-during-tutorial |
| Merge into: | lp://qastaging/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://qastaging/~mterry/unity8/relock-during-tutorial |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity8 CI Bot | continuous-integration | Needs Fixing | |
| Michał Sawicz | Needs Fixing | ||
| PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
| Albert Astals Cid (community) | Approve | ||
|
Review via email:
|
|||
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-
- 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:/
- 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 | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Michael Terry (mterry) wrote | # |
| Michael Terry (mterry) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Michael Terry (mterry) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Michael Terry (mterry) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| PS Jenkins bot (ps-jenkins) wrote | # |
| Albert Astals Cid (aacid) wrote | # |
| Unity8 CI Bot (unity8-ci-bot) wrote | # |
| Michael Terry (mterry) wrote | # |
Unmerged revisions
- 2183. By Michael Terry
-
Merge from trunk
- 2182. By Michael Terry
-
Show launcher in LeftFinish screen after a lock/unlock
- 2181. By Michael Terry
-
Fix whitespace
- 2180. By Michael Terry
-
Actually tear down greeter when force unlocked (to keep it unlocked until shown)
- 2179. By Michael Terry
-
Fix tests
- 2178. By Michael Terry
-
Allow re-locking screen even if tutorial is running
FAILED: Continuous integration, rev:2178
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/