Merge lp://qastaging/~tiagosh/dialer-app/greeter-refactor into lp://qastaging/dialer-app
Status: | Merged |
---|---|
Approved by: | Gustavo Pichorim Boiko |
Approved revision: | 330 |
Merged at revision: | 331 |
Proposed branch: | lp://qastaging/~tiagosh/dialer-app/greeter-refactor |
Merge into: | lp://qastaging/dialer-app |
Diff against target: |
437 lines (+134/-61) 6 files modified
src/qml/ContactsPage/ContactsPage.qml (+1/-1) src/qml/DialerPage/DialerPage.qml (+14/-14) src/qml/HistoryPage/HistoryDetailsPage.qml (+1/-1) src/qml/HistoryPage/HistoryPage.qml (+2/-2) src/qml/LiveCallPage/LiveCall.qml (+10/-7) src/qml/dialer-app.qml (+106/-36) |
To merge this branch: | bzr merge lp://qastaging/~tiagosh/dialer-app/greeter-refactor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gustavo Pichorim Boiko (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Emergency mode refactor.
Use two page stacks: one for normal mode and another for emergency mode.
Description of the change
Emergency mode refactor.
Use two page stacks: one for normal mode and another for emergency mode.
--Checklist--
Are there any related MPs required for this MP to build/function as expected? Please list.
No
Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes
Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes
Did you successfully run all tests found in your component's Test Plan (https:/
Yes
If you changed the UI, was the change specified/approved by design?
N/A
If you changed UI labels, did you update the pot file?
N/A
If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A
FAILED: Continuous integration, rev:327 jenkins. qa.ubuntu. com/job/ dialer- app-ci/ 495/ jenkins. qa.ubuntu. com/job/ dialer- app-vivid- i386-ci/ 5 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 541/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- vivid/303 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 472/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 539 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 539/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16538 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-vivid/ 259 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 309 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-amd64/ 309/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/dialer- app-ci/ 495/rebuild
http://