Merge lp:~mterry/ubuntu-system-settings/flickable-passwd-page into lp:ubuntu-system-settings
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Sebastien Bacher | ||||
Approved revision: | 1059 | ||||
Merged at revision: | 1067 | ||||
Proposed branch: | lp:~mterry/ubuntu-system-settings/flickable-passwd-page | ||||
Merge into: | lp:ubuntu-system-settings | ||||
Diff against target: |
248 lines (+103/-91) 3 files modified
wizard/qml/Components/Page.qml (+4/-5) wizard/qml/Pages/15-passwd.qml (+93/-85) wizard/qml/main.qml (+6/-1) |
||||
To merge this branch: | bzr merge lp:~mterry/ubuntu-system-settings/flickable-passwd-page | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Ubuntu Touch System Settings | Pending | ||
Review via email: mp+235117@code.launchpad.net |
Commit message
Prevent the buttons of the wizard's password page from overlapping its content when the OSK appears. (LP: #1368346)
I added a Flickable to the page, so the page content can clip to the to top of the buttons. I also fixed the background image visibly moving up along with the OSK.
Description of the change
Prevent the buttons of the wizard's password page from overlapping its content when the OSK appears. (LP: #1368346)
I added a Flickable to the page, so the page content can clip to the to top of the buttons. I also fixed the background image visibly moving up along with the OSK.
I investigated a more generic solution (Flickable for all pages in the Page class), but that would involve quite an overhaul. All the content of the pages would need to be specified as Components (like the Forward button is now) in order to be able to parent them however the Page class likes. And that means nothing outside of that component can reference objects inside... It looked to be a pain. Not for this point in the cycle, I'd say
== Checklist ==
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
Just qml changes
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
Just qml changes
* Has your component "TestPlan” been executed successfully on emulator, N4?
Yes
* Has a 5 minute exploratory testing run been executed on N4?
Yes
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
NA
* If you changed the UI, did you subscribe the design-reviewers to this MP?
Not really a design-reviewy change
* What components might get impacted by your changes?
Just wizard
* Have you requested review by the teams of these owning components?
Yes
PASSED: Continuous integration, rev:1059 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1499/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/4945 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 3606 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 691 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/4700 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6197 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/6197/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 13387 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 2993 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3915 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/3915/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1499/ rebuild
http://