Merge lp:~mterry/unity8/sim-unlock-on-boot into lp:unity8
Status: | Superseded | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~mterry/unity8/sim-unlock-on-boot | ||||
Merge into: | lp:unity8 | ||||
Prerequisite: | lp:~dandrader/unity8/lifecycle | ||||
Diff against target: |
507 lines (+353/-0) 19 files modified
plugins/Ubuntu/CMakeLists.txt (+1/-0) plugins/Ubuntu/Connectivity/CMakeLists.txt (+10/-0) plugins/Ubuntu/Connectivity/Connectivity.cpp (+33/-0) plugins/Ubuntu/Connectivity/Connectivity.h (+33/-0) plugins/Ubuntu/Connectivity/Connectivity.qmltypes (+17/-0) plugins/Ubuntu/Connectivity/plugin.cpp (+34/-0) plugins/Ubuntu/Connectivity/plugin.h (+31/-0) plugins/Ubuntu/Connectivity/qmldir (+3/-0) qml/Notifications/NotificationMenuItemFactory.qml (+5/-0) qml/Shell.qml (+5/-0) tests/mocks/Ubuntu/CMakeLists.txt (+1/-0) tests/mocks/Ubuntu/Connectivity/CMakeLists.txt (+10/-0) tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes (+18/-0) tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp (+27/-0) tests/mocks/Ubuntu/Connectivity/MockConnectivity.h (+36/-0) tests/mocks/Ubuntu/Connectivity/plugin.cpp (+34/-0) tests/mocks/Ubuntu/Connectivity/plugin.h (+31/-0) tests/mocks/Ubuntu/Connectivity/qmldir (+3/-0) tests/qmltests/tst_Shell.qml (+21/-0) |
||||
To merge this branch: | bzr merge lp:~mterry/unity8/sim-unlock-on-boot | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Zanetti | Pending | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+231796@code.launchpad.net |
This proposal supersedes a proposal from 2014-08-15.
This proposal has been superseded by a proposal from 2014-08-22.
Commit message
Show the SIM unlock dialog immediately after booting, and enable its emergency call button.
Description of the change
Show the SIM unlock dialog immediately after booting, and enable its emergency call button.
A couple notes about the implementation:
- I've added *yet another* tiny plugin for one DBus call. I didn't think there was an existing plugin that really fit it. I'm not thrilled about it either, but it fits the current plugin tradition. A future branch should consolidate our tiny plugins in some sensible way.
- I've deliberately ignored design's request that the dialog appear *under* the infographic screen. Oddly enough, this is technically challenging to do. We'd have to re-parent the dialog and place it there, make it non-modal (to some parts of the shell), and have the notification system treat it specially. We'd also have to be careful to only treat just that one request differently, and to do that, we'd probably need more support for tracing which notifications came from which component and such. I figure that for a first pass, we can just do this the dumb way. If the notification frontend becomes smarter, we can make it nice. We're way past UI freeze, so I didn't want to delay this branch too much longer just to get that right.
== Checklist ==
* Are there any related MPs required for this MP to build/function as expected? Please list.
- Yes, https:/
* 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?
- Design specifies that the unlock dialog should be below the infographic screen (see above), but otherwise this is what design specs out in https:/
Unmerged revisions
- 1167. By Michael Terry
-
Merge lifecycle branch in
FAILED: Continuous integration, rev:1164 jenkins. qa.ubuntu. com/job/ unity8- ci/3941/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/3620/ console jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 942 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 1035 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 1035 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 1035/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 1035 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/3508/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/4867 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/4867/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 11576
http://
Executed test runs:
FAILURE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/3941/ rebuild
http://