Merge lp:~renatofilho/address-book-app/fix-1332124 into lp:~phablet-team/address-book-app/staging

[Renato Araujo Oliveira Filho]

Fixed phone context parser based on Evolution types.

In evolution database these are the correct values:

Mobbile = Context: "home" SubType: "cell"
Work Mobbile = Context: "work" SubType: "cell"
Home = Context: "home" SubType: "voice"
Work = Context: "work" SubType: "voice"
Other = Context: "other" SubType: "voice"

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/213/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1719
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1454
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/213
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/213
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/213/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/213
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1982
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2764
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2764/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9493
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1212
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1623
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1623/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[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 CHANGE

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

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the MR.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-autolanding/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1759
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1479
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-autolanding/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/41
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-autolanding/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-autolanding/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2019
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2819
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2819/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9549
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1661
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1661/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

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

214. By Renato Araujo Oliveira Filho on 2014-07-09

Merged lp:~renatofilho/address-book-app/new-avatar-empty-icon-on-edit-mode, with fixes for build on jenkins.

Unmerged revisions

211. By Renato Araujo Oliveira Filho on 2014-07-08

Create Contacts singleton class to export helper functions into QML.
Extend ContactAvatar element to be possible to use in different apps.

210. By Renato Araujo Oliveira Filho on 2014-07-08

Prevent to have two swiped items.
Removed unused images
Make sure to use theme images when possible
Animate contact delegate opacity when selection a contact.

209. By Renato Araujo Oliveira Filho on 2014-07-08

Trunk merged.

208. By Omer Akram on 2014-07-08

make use of memory backend in autopilot testing optional. Fixes: https://bugs.launchpad.net/bugs/1328921.

Approved by PS Jenkins bot, Renato Araujo Oliveira Filho.

207. By Leo Arias on 2014-07-07

Call get_header from ubuntu-ui-toolkit-autopilot.

Approved by Renato Araujo Oliveira Filho, PS Jenkins bot.

206. By Renato Araujo Oliveira Filho on 2014-07-04

Trunk merged.

205. By Renato Araujo Oliveira Filho on 2014-07-03

Trunk merged.

=== modified file 'debian/control'
--- debian/control	2014-07-08 17:48:34 +0000
+++ debian/control	2014-07-09 20:13:38 +0000
@@ -32,6 +32,7 @@
 Architecture: amd64 armhf i386
 Depends: libqt5contacts5,
          libqt5versit5,
+         ubuntu-ui-toolkit-theme (>= 0.1.49+14.10.20140707),
          qmlscene,
          qtcontact5-galera,
          qtdeclarative5-qtcontacts-plugin,
@@ -51,6 +52,7 @@
 Depends: qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
          qtdeclarative5-qtcontacts-plugin,
+         suru-icon-theme,
          ${misc:Depends},
          ${shlibs:Depends},
 Description: Qt Ubuntu Contacts Components - QML plugin

=== modified file 'src/imports/ContactEdit/ContactDetailAvatarEditor.qml'
--- src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-06-23 18:35:43 +0000
+++ src/imports/ContactEdit/ContactDetailAvatarEditor.qml	2014-07-09 20:13:38 +0000
@@ -23,7 +23,7 @@
 ContactDetailBase {
     id: root
 
-    readonly property string defaultAvatar: "image://theme/contact"
+    readonly property string defaultAvatar: "image://theme/add"
 
     function isEmpty() {
         return false;
@@ -68,14 +68,18 @@
 
         radius: "medium"
         anchors.fill: parent
-        image: Image {
+        image: avatarImage.source != defaultAvatar ? avatarImage : null
+
+        Image {
             id: avatarImage
 
             fillMode: Image.PreserveAspectCrop
             asynchronous: true
             source: root.getAvatar(root.detail)
-            height: units.gu(8)
-            width: units.gu(8)
+            anchors.centerIn: visible ? avatar : undefined
+            height: units.gu(3)
+            width: units.gu(3)
+            visible: source == defaultAvatar
 
             // When updating the avatar using the content picker the temporary file returned
             // can contain the same name as the previous one and if the cache is enabled this

=== modified file 'src/imports/ContactEdit/ValueSelector.qml'
--- src/imports/ContactEdit/ValueSelector.qml	2014-06-18 13:47:42 +0000
+++ src/imports/ContactEdit/ValueSelector.qml	2014-07-09 20:13:38 +0000
@@ -93,7 +93,7 @@
         }
 
         Icon {
-            name: "chevron"
+            name: "go-next"
             color: "black"
             height: units.gu(1)
             width: height
@@ -164,8 +164,7 @@
             Icon {
                 id: arrow
 
-                name: "chevron"
-                color: "white"
+                name: "go-next"
                 height: visible ? units.gu(1) : 0
                 width: height
                 visible: index < (listView.count - 1)

=== modified file 'src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml'
--- src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-05-28 19:56:00 +0000
+++ src/imports/Ubuntu/Contacts/ContactDetailPhoneNumberTypeModel.qml	2014-07-09 20:13:38 +0000
@@ -41,7 +41,12 @@
         } else if (contexts.indexOf(QtContacts.ContactDetail.ContextOther) > -1) {
             return 4
         } else {
-            return 2 // Default value is "Mobile"
+            // phone without context is and voice type is other
+            if (subTypes && subTypes.indexOf(QtContacts.PhoneNumber.Voice) > -1) {
+                return 4
+            } else {
+                return 2 // Default value is "Mobile"
+            }
         }
     }
 
@@ -92,15 +97,15 @@
 
     Component.onCompleted: {
         append({"value": "Home", "label": i18n.dtr("address-book-app", "Home"), "icon": null,
-                "context": QtContacts.ContactDetail.ContextHome, "subType": QtContacts.PhoneNumber.Landline })
+                "context": QtContacts.ContactDetail.ContextHome, "subType": QtContacts.PhoneNumber.Voice })
         append({"value": "Work", "label": i18n.dtr("address-book-app", "Work"), "icon": null,
-               "context": QtContacts.ContactDetail.ContextWork, "subType": QtContacts.PhoneNumber.Landline })
+               "context": QtContacts.ContactDetail.ContextWork, "subType": QtContacts.PhoneNumber.Voice })
         append({"value": "Mobile", "label": i18n.dtr("address-book-app", "Mobile"), "icon": null,
                 "context": QtContacts.ContactDetail.ContextHome, "subType": QtContacts.PhoneNumber.Mobile })
         append({"value": "Mobile-Work", "label": i18n.dtr("address-book-app", "Work Mobile"), "icon": null,
                 "context": QtContacts.ContactDetail.ContextWork, "subType": QtContacts.PhoneNumber.Mobile })
         append({"value": "Other", "label": i18n.dtr("address-book-app", "Other"), "icon": null,
-                "context": QtContacts.ContactDetail.ContextOther, "subType": QtContacts.PhoneNumber.Landline })
+                "context": QtContacts.ContactDetail.ContextOther, "subType": QtContacts.PhoneNumber.Voice })
         loaded()
     }
 }