Merge lp:~renatofilho/address-book-app/release-2014-07-09 into lp:address-book-app

[Renato Araujo Oliveira Filho]

* Show the "+" icon in contact editor mode if the image is empty.
* Fixed app crash wen starting the searching from favorite mode.

[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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/600/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1499
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2044
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2850
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9583
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1255
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1685
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1685/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

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.
Yes

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

review: Approve

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-07-07 19:46:23 +0000
+++ click/manifest.json.in	2014-07-10 00:46:00 +0000
@@ -18,4 +18,4 @@
         "vcs-bzr": "lp:address-book-app",
         "vcs-bzr-revno": "@BZR_REVNO@"
     }
-}
+}
 \ No newline at end of file
 
=== modified file 'debian/control'
--- debian/control	2014-07-08 17:48:34 +0000
+++ debian/control	2014-07-10 00:46:00 +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-10 00:46:00 +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-10 00:46:00 +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-10 00:46:00 +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()
     }
 }
 
=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-03 19:35:30 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-07-10 00:46:00 +0000
@@ -373,6 +373,14 @@
                 return tag
         }
 
+        // if the favorite header became invisible we should move back to all contacts.
+        onShowFavouritesChanged: {
+            if (!showFavourites && view.favouritesIsSelected) {
+                root.changeFilter(root.filter)
+                view.favouritesIsSelected = false
+            }
+        }
+
         anchors {
             top: itemHeader.bottom
             left: parent.left
@@ -523,22 +531,31 @@
         IntersectionFilter {
             id: contactsFilter
 
-            property bool active: false
-
-            filters: {
-                var filters = []
+            property bool active: {
+                var filters_ = []
                 if (contactTermFilter.value.length > 0) {
-                    filters.push(contactTermFilter)
-                } else if (view.showFavourites && view.favouritesIsSelected) {
-                    filters.push(favouritesFilter)
+                    filters_.push(contactTermFilter)
+                } else if (view.favouritesIsSelected) {
+                    filters_.push(favouritesFilter)
                 }
 
                 if (root.filter) {
-                    filters.push(root.filter)
-                }
-
-                active = (filters.length > 0)
-                return filters
+                    filters_.push(root.filter)
+                }
+
+                // check if the filter has changed
+                var oldFilters = contactsFilter.filters
+                if (oldFilters.length !== filters_.length) {
+                    contactsFilter.filters = filters_
+                } else {
+                    for(var i=0; i < oldFilters.length; i++) {
+                        if (filters_.indexOf(oldFilters[i]) === -1) {
+                            contactsFilter.filters = filters_
+                        }
+                    }
+                }
+
+                return (filters_.length > 0)
             }
         }
 
@@ -550,25 +567,12 @@
             interval: 300
             onTriggered: {
                 view.positionViewAtBeginning()
-                var needUpdate = false
-                if (root.filterTerm === "") { // if the search criteria is empty clear the list before show all contacts
-                    if (contactTermFilter.value !== "") {
-                        root.changeFilter(root.filter)
-                        contactTermFilter.value = ""
-                        needUpdate = true
-                    }
-                } else {
-                    if (contactTermFilter.value !== root.filterTerm) {
-                        if (contactTermFilter.value === "") { // if the search starts clear the list before show results
-                            root.changeFilter(root.filter)
-                        }
-                        contactTermFilter.value = root.filterTerm
-                        needUpdate = true
-                    }
-                }
+
+                root.changeFilter(root.filter)
+                contactTermFilter.value = root.filterTerm
 
                 // manually update if autoUpdate is disabled
-                if (needUpdate && !root.autoUpdate) {
+                if (!root.autoUpdate) {
                     contactsModel.update()
                 }
             }