Merge lp://qastaging/~phablet-team/messaging-app/fix_bottom_edge into lp://qastaging/messaging-app
- fix_bottom_edge
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Tiago Salem Herrmann |
Approved revision: | 593 |
Merged at revision: | 583 |
Proposed branch: | lp://qastaging/~phablet-team/messaging-app/fix_bottom_edge |
Merge into: | lp://qastaging/messaging-app |
Prerequisite: | lp://qastaging/~phablet-team/messaging-app/remove_apl_workarounds |
Diff against target: |
815 lines (+106/-341) 15 files modified
debian/rules (+1/-1) src/messagingapplication.cpp (+36/-1) src/messagingapplication.h (+1/-0) src/qml/InputInfo.qml (+0/-42) src/qml/MMSDelegate.qml (+2/-3) src/qml/MainPage.qml (+7/-13) src/qml/Messages.qml (+15/-73) src/qml/MessagesListView.qml (+1/-2) src/qml/MessagingBottomEdge.qml (+7/-42) src/qml/SMSDelegate.qml (+1/-2) src/qml/SettingsPage.qml (+1/-15) src/qml/messaging-app.qml (+25/-139) tests/qml/tst_DualSim.qml (+4/-4) tests/qml/tst_MMSDelegate.qml (+3/-2) tests/qml/tst_SingleSim.qml (+2/-2) |
To merge this branch: | bzr merge lp://qastaging/~phablet-team/messaging-app/fix_bottom_edge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tiago Salem Herrmann (community) | Approve | ||
system-apps-ci-bot | continuous-integration | Approve | |
Review via email: mp+300795@code.qastaging.launchpad.net |
Commit message
Do not use bottom edge when in two columns mode and preserve the views when alternating between one and two columns.
Description of the change
Do not use bottom edge when in two columns mode and preserve the views when alternating between one and two columns.
- 583. By Gustavo Pichorim Boiko
-
Do not destroy the bottom edge instance in two columns, instead just make it disabled.
- 584. By Gustavo Pichorim Boiko
-
Fix height
- 585. By Gustavo Pichorim Boiko
-
Merge parent
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
- 586. By Gustavo Pichorim Boiko
-
In one column, don't show empty state
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:586
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
- 587. By Gustavo Pichorim Boiko
-
Fix QML tests
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:587
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 588. By Gustavo Pichorim Boiko
-
Preload the bottom edge page to avoid visual glitches.
- 589. By Gustavo Pichorim Boiko
-
Fix displaying the new message item.
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:589
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 590. By Gustavo Pichorim Boiko
-
Update the new message status.
- 591. By Gustavo Pichorim Boiko
-
Merge parent
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:591
https:/
Executed test runs:
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Tiago Salem Herrmann (tiagosh) wrote : | # |
Found two small issues:
1) If the bottom edge is already open with some data entered and we tap the plus icon again, the new message view is reloaded and the data entered is lost.
2) When opening the bottom edge the multi recipient entry is not getting focus.
- 592. By Gustavo Pichorim Boiko
-
Fix all cases for showing the new conversation entry
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:592
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
- 593. By Gustavo Pichorim Boiko
-
Make sure the recipients field gets focused when opening bottom edge
system-apps-ci-bot (system-apps-ci-bot) wrote : | # |
PASSED: Continuous integration, rev:593
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild:
https:/
Tiago Salem Herrmann (tiagosh) wrote : | # |
Looks good.
thanks.
- 594. By Gustavo Pichorim Boiko
-
Disable failing tests.
FAILED: Continuous integration, rev:585 /jenkins. canonical. com/system- apps/job/ lp-messaging- app-ci/ 61/ /jenkins. canonical. com/system- apps/job/ build/1020/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1020 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= vivid+overlay/ 918 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= xenial+ overlay/ 918 /jenkins. canonical. com/system- apps/job/ build-1- sourcepkg/ release= yakkety/ 918 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 912/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 912/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-messaging- app-ci/ 61/rebuild
https:/