Merge lp://qastaging/~renatofilho/address-book-app/visuals-update into lp://qastaging/address-book-app
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 538 |
Merged at revision: | 536 |
Proposed branch: | lp://qastaging/~renatofilho/address-book-app/visuals-update |
Merge into: | lp://qastaging/address-book-app |
Diff against target: |
369 lines (+119/-24) 16 files modified
src/imports/Settings/SettingsPage.qml (+3/-3) src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml (+2/-1) src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml (+0/-1) src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml (+0/-1) src/imports/Ubuntu/Contacts/CMakeLists.txt (+1/-0) src/imports/Ubuntu/Contacts/ContactAvatar.qml (+19/-7) src/imports/Ubuntu/Contacts/ContactDelegate.qml (+1/-1) src/imports/Ubuntu/Contacts/ContactDetailPickerPhoneNumberDelegate.qml (+0/-2) src/imports/Ubuntu/Contacts/ContactListButtonDelegate.qml (+0/-1) src/imports/Ubuntu/Contacts/Contacts.js (+7/-0) src/imports/Ubuntu/Contacts/FastScroll.qml (+20/-5) src/imports/Ubuntu/Contacts/ListItemWithActions.qml (+1/-1) src/imports/Ubuntu/Contacts/Triangle.qml (+52/-0) src/imports/Ubuntu/Contacts/contacts.cpp (+5/-0) src/imports/Ubuntu/Contacts/contacts.h (+1/-0) tests/qml/tst_ContactAvatar.qml (+7/-1) |
To merge this branch: | bzr merge lp://qastaging/~renatofilho/address-book-app/visuals-update |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email:
|
Commit message
Use a list of colors as avatar background color.
Use flat visual for avatar ubuntu shape.
Does not use 'lightAubergine' for labels.
To post a comment you must log in.
FAILED: Continuous integration, rev:532 jenkins. qa.ubuntu. com/job/ address- book-app- ci/1096/ jenkins. qa.ubuntu. com/job/ address- book-app- vivid-i386- ci/399/ console jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6138/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6149/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/address- book-app- ci/1096/ rebuild
http://