Merge lp:~renatofilho/dialer-app/non-expansion into lp:dialer-app

[Renato Araujo Oliveira Filho]

Implement support for no-expandable contacts list

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:407
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/558/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/71/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2680/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/886/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2678/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1063/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/558/rebuild

review: Needs Fixing (continuous-integration)

[lp:~renatofilho/dialer-app/non-expansion]

408. By Renato Araujo Oliveira Filho on 2015-05-12

Parent merged.

409. By Renato Araujo Oliveira Filho on 2015-05-12

Update autopilot.

410. By Renato Araujo Oliveira Filho on 2015-05-12

Parent merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:410
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/563/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/76/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2751/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/901/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2749/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1081/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/563/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?
YES: https://code.launchpad.net/~renatofilho/address-book-app/no-expasion/+merge/258546

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?
YES

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

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

[lp:~renatofilho/dialer-app/non-expansion]

411. By Renato Araujo Oliveira Filho on 2015-05-13

parent merged.

412. By Renato Araujo Oliveira Filho on 2015-05-13

Parent merged.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:412
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/565/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2792/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2790/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/565/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:410
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/568/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2820/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2818/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/568/rebuild

review: Needs Fixing (continuous-integration)

[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: this branch needs changes on address-book-app

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

review: Approve

[lp:~renatofilho/dialer-app/non-expansion]

413. By Renato Araujo Oliveira Filho on 2015-05-14

Parent merged.

414. By Renato Araujo Oliveira Filho on 2015-05-15

Avoid fetch contact twice.

=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml	2015-05-15 18:04:48 +0000
+++ src/qml/ContactsPage/ContactsPage.qml	2015-05-15 18:04:48 +0000
@@ -161,6 +161,8 @@
         showImportOptions: (contactList.count === 0) &&
                            (filterTerm === "") &&
                            (contactsPage.phoneToAdd === "")
+        filterTerm: searchField.text
+
         onAddNewContactClicked: {
             var newContact = ContactsJS.createEmptyContact(contactsPage.phoneToAdd, contactsPage)
             pageStack.push(Qt.resolvedUrl("../ContactEditorPage/DialerContactEditorPage.qml"),
@@ -170,35 +172,18 @@
                              contactListPage: contactsPage
                            })
         }
-        onInfoRequested: mainView.viewContact(contact.contactId, contactList.listModel)
-
-        filterTerm: searchField.text
-        detailToPick: (contactsPage.phoneToAdd != "") ? -1 : ContactDetail.PhoneNumber
-        onDetailClicked: {
-            if (action === "message") {
-                Qt.openUrlExternally("message:///" + encodeURIComponent(detail.number))
-                return
-            }
-
+        onContactClicked: {
             if (contactsPage.phoneToAdd != "") {
                 mainView.addPhoneToContact(contact,
                                            contactsPage.phoneToAdd,
                                            contactsPage,
                                            contactList.listModel)
-                return
-            }
-
-            pageStackNormalMode.pop()
-            if (callManager.hasCalls) {
-                mainView.call(detail.number, mainView.account.accountId);
             } else {
-                mainView.populateDialpad(detail.number)
+                mainView.viewContact(contact,
+                                     contactsPage,
+                                     contactList.listModel)
             }
         }
-        onAddDetailClicked: mainView.addPhoneToContact(contact.contactId,
-                                                       " ",
-                                                       contactsPage,
-                                                       contactList.listModel)
     }
 
     Component.onCompleted: {

=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2015-05-15 18:04:48 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2015-05-15 18:04:48 +0000
@@ -57,7 +57,7 @@
                 if (unknownContact) {
                     mainView.addNewPhone(phoneNumber)
                 } else {
-                    mainView.viewContact(contactWatcher.contactId, null)
+                    mainView.viewContact(contactWatcher.contactId, null, null)
                 }
             }
         },

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2015-05-15 18:04:48 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2015-05-15 18:04:48 +0000
@@ -347,7 +347,7 @@
                             if (unknownContact) {
                                 mainView.addNewPhone(phoneNumber)
                             } else {
-                                mainView.viewContact(contactId, null)
+                                mainView.viewContact(contactId, null, null)
                             }
                         }
                         visible: knownNumber

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2015-05-15 18:04:48 +0000
+++ src/qml/dialer-app.qml	2015-05-15 18:04:48 +0000
@@ -183,12 +183,13 @@
                                  {"phoneToAdd": phoneNumber})
     }
 
-    function viewContact(contactId, model) {
-        var initialPropers = {}
-        if (model) {
-            initialPropers = {"contactId": contactId, "model": model}
+    function viewContact(contact, contactListPage, model) {
+        var initialPropers = {"model": model}
+
+        if (typeof(contact) == 'string') {
+            initialPropers["contactId"] = contact
         } else {
-            initialPropers = {"contactId": contactId}
+            initialPropers["contact"] = contact
         }
         pageStackNormalMode.push(Qt.resolvedUrl("ContactViewPage/DialerContactViewPage.qml"),
                                  initialPropers)
@@ -196,11 +197,9 @@
 
     function addPhoneToContact(contact, phoneNumber, contactListPage, model) {
         var initialPropers =  {"addPhoneToContact": phoneNumber,
-                               "contactListPage": contactListPage}
+                               "contactListPage": contactListPage,
+                               "model": model }
 
-        if (model) {
-            initialPropers["model"] = model
-        }
         if (typeof(contact) == 'string') {
             initialPropers["contactId"] = contact
         } else {

=== modified file 'tests/autopilot/dialer_app/__init__.py'
--- tests/autopilot/dialer_app/__init__.py	2015-05-15 18:04:48 +0000
+++ tests/autopilot/dialer_app/__init__.py	2015-05-15 18:04:48 +0000
@@ -275,12 +275,7 @@
         self.pointing_device.click_object(contact_delegate)
 
     def open_contact(self, index):
-        contact_delegate = self._get_contact_delegate(index)
-        self.pointing_device.click_object(contact_delegate)
-        contact_delegate.state.wait_for('expanded')
-        details_button = contact_delegate.wait_select_single(
-            objectName='infoIcon')
-        self.pointing_device.click_object(details_button)
+        self.click_contact(index)
         return self.get_root_instance().select_single(
             DialerContactViewPage, objectName='contactViewPage')