Merge lp://staging/~tiagosh/dialer-app/port-ui-toolkit-1.3 into lp://staging/dialer-app
Proposed by
Tiago Salem Herrmann
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 464 |
Merged at revision: | 473 |
Proposed branch: | lp://staging/~tiagosh/dialer-app/port-ui-toolkit-1.3 |
Merge into: | lp://staging/dialer-app |
Diff against target: |
425 lines (+52/-51) 28 files modified
src/qml/ContactEditorPage/DialerContactEditorPage.qml (+1/-1) src/qml/ContactViewPage/DialerContactViewPage.qml (+2/-2) src/qml/ContactsPage/ContactsPage.qml (+3/-3) src/qml/DialerPage/CallButton.qml (+1/-1) src/qml/DialerPage/CustomButton.qml (+1/-1) src/qml/DialerPage/DialerPage.qml (+3/-3) src/qml/DialerPage/Keypad.qml (+2/-2) src/qml/DialerPage/KeypadButton.qml (+1/-1) src/qml/DialerPage/KeypadEntry.qml (+2/-2) src/qml/Dialogs/DisableFlightModeDialog.qml (+2/-2) src/qml/Dialogs/NoDefaultSIMCardDialog.qml (+2/-2) src/qml/Dialogs/NotificationDialog.qml (+2/-2) src/qml/Dialogs/SetDefaultSIMCardDialog.qml (+2/-2) src/qml/Dialogs/SimLockedDialog.qml (+2/-2) src/qml/HistoryPage/ExpandableButton.qml (+2/-2) src/qml/HistoryPage/HistoryDelegate.qml (+3/-3) src/qml/HistoryPage/HistoryDetailsPage.qml (+2/-2) src/qml/HistoryPage/HistoryPage.qml (+2/-2) src/qml/HistoryPage/SwipeItemDemo.qml (+1/-1) src/qml/LiveCallPage/ConferenceCallDisplay.qml (+2/-2) src/qml/LiveCallPage/HangupButton.qml (+1/-1) src/qml/LiveCallPage/LiveCall.qml (+3/-3) src/qml/LiveCallPage/LiveCallKeypadButton.qml (+1/-1) src/qml/LiveCallPage/MultiCallDisplay.qml (+2/-2) src/qml/LiveCallPage/StopWatch.qml (+1/-1) src/qml/MMI/IMEI.qml (+2/-2) src/qml/dialer-app.qml (+2/-3) tests/qml/tst_DialerPage.qml (+2/-0) |
To merge this branch: | bzr merge lp://staging/~tiagosh/dialer-app/port-ui-toolkit-1.3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+270316@code.staging.launchpad.net |
Commit message
Port dialer-app to ui-toolkit 1.3
Description of the change
Port dialer-app to ui-toolkit 1.3
To post a comment you must log in.
FAILED: Continuous integration, rev:462 jenkins. qa.ubuntu. com/job/ dialer- app-ci/ 597/ jenkins. qa.ubuntu. com/job/ dialer- app-vivid- i386-ci/ 110 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 4050 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 3308 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 4047 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 4047/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 23113
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/dialer- app-ci/ 597/rebuild
http://