Merge lp:~renatofilho/address-book-app/fix-1511478 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Avoid blurry avatar images while creating a new contact.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:494
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/990/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4927
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4924
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4924/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24715

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/990/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

I've tried the fix and it fixes the issue indeed, I'm not sure to understand the code though, shouldn't the avatar height/width be used in the case when the image is visible?

[Renato Araujo Oliveira Filho (renatofilho)]

The image object switches btw the "+" icon and the avatar itself.

When set to the avatar image we can make it invisible because it will be used by UbuntuShape (check UbuntuShape.source for more info) when visible it will show "+" icon and we want the icon in 3x3 size, to fit to designer spec.

[Sebastien Bacher (seb128)]

oh right, that makes sense, thanks

review: Approve

[lp:~renatofilho/address-book-app/fix-1511478]

495. By Renato Araujo Oliveira Filho on 2015-11-05

Trunk merged.

[Renato Araujo Oliveira Filho (renatofilho)]

Are there any related MPs required for this MP to build/function as expected?
NO

Is your branch in sync with latest trunk?
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 on device or emulator?
YES

If you changed the UI, was the change specified/approved by design?
NO UI CHANGED

If you changed UI labels, did you update the pot file?
NO LABEL CHANGED

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
NO PACKAGING CHANGED

[lp:~renatofilho/address-book-app/fix-1511478]

496. By Renato Araujo Oliveira Filho on 2015-11-24

Trunk merged.

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-10-28 19:42:30 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-11-24 00:28:43 +0000
@@ -88,8 +88,8 @@
             width: units.gu(3)
             visible: source == defaultAvatar
             sourceSize {
-                width: units.gu(3)
-                height: units.gu(3)
+                width: avatarImage.visible ? units.gu(3) : avatar.width
+                height: avatarImage.visible ? units.gu(3) : avatar.height
             }
 
             // When updating the avatar using the content picker the temporary file returned