Merge into staging : search : Code : address-book-app

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2014-06-05	Approve on 2014-06-09
Tiago Salem Herrmann (community)		2014-06-05	Approve on 2014-06-09
Review via email: mp+222241@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-09: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-09: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-09: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:194
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/13/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/121/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/108/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/151/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-09: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-12: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-12: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-13: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-15: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-16: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-16: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-16: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-22: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-22: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-27: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-28: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-29: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-29: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-05-30: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-03: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/83/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/627
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1065
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1206
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8021
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/512
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/714
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/714/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/83/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-04: Posted in a previous version of this proposal

#

FAILED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/649
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/594
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-team-address-book-app-staging-utopic-i386-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1078
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1241
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1241/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8044
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/733
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/733/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/85/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-04: Posted in a previous version of this proposal

#

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

review: Approve (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-06-05: Posted in a previous version of this proposal

#

I found a couple of issues:

1) there is no way to see the last items in the list view when the osk is open. The list view should attach to the osk top.

2) the search field should have word prediction disabled, otherwise it won't trigger the query until the entered text is committed (space or tap in a suggested word). Something like this should be enough: inputMethodHints: Qt.ImhNoPredictiveText

3) on the device with a big contact list (+600 contacts) the app crashes when you change the search term too fast, it seems to me like the search filter is being changed any time you change the search term right away. That means if the user types the search term too fast, the app will crash.

4) I know that the contact list collapse is going away, but if you collapse the list and switch to favorites while the list is still collapsing, the app crashes too.

review: Needs Fixing

Revision history for this message

Renato Araujo Oliveira Filho (renatofilho) wrote on 2014-06-05: Posted in a previous version of this proposal

#

> I found a couple of issues:
>
> 1) there is no way to see the last items in the list view when the osk is
> open. The list view should attach to the osk top.
Fixed on rev. 233

>
> 2) the search field should have word prediction disabled, otherwise it won't
> trigger the query until the entered text is committed (space or tap in a
> suggested word). Something like this should be enough: inputMethodHints:
> Qt.ImhNoPredictiveText
Fixed on rev. 234

>
> 3) on the device with a big contact list (+600 contacts) the app crashes when
> you change the search term too fast, it seems to me like the search filter is
> being changed any time you change the search term right away. That means if
> the user types the search term too fast, the app will crash.
I am testing with 1500 contacts, and I can not reproduce the problem. Anyway I update the code
to wait some ms before start search, this will consume less cpu and bayberry.

>
> 4) I know that the contact list collapse is going away, but if you collapse
> the list and switch to favorites while the list is still collapsing, the app
> crashes too.
Yes this will go away, but this bug is not related with the current branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-05: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/search updated on 2014-06-05

226. By Renato Araujo Oliveira Filho on 2014-06-05: Merged parent branch.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-05:

#

FAILED: Continuous integration, rev:225
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/address-book-app/search/+merge/222241/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-06-05: Posted in a previous version of this proposal

#

Those bugs were indeed fixed in this last version, but I found one more:

1) Search for a contact
2) tap on a contact to show its details
3) tap on the back button

result: list is still filtered by the last search term and the header is back to normal, so you need to tap search again to change it.

We should clear the search term immediately after you tap a contact.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-05:

#

FAILED: Continuous integration, rev:226
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/address-book-app/search/+merge/222241/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/search updated on 2014-06-05

227. By Renato Araujo Oliveira Filho on 2014-06-05: Before clear the filter make sure that the contact list is empty. This will make the list update looks faster.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-06:

#

FAILED: Continuous integration, rev:227
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~renatofilho/address-book-app/search/+merge/222241/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

lp:~renatofilho/address-book-app/search updated on 2014-06-07

228. By Renato Araujo Oliveira Filho on 2014-06-06: Merged parent branch.
229. By Renato Araujo Oliveira Filho on 2014-06-06: Revert change on package description.
230. By Renato Araujo Oliveira Filho on 2014-06-06: Clear search text after leave contact list page.
231. By Renato Araujo Oliveira Filho on 2014-06-07: Updated click instructions.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-07:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) on 2014-06-09:

#

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-06-09:

#

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

review: Approve (continuous-integration)

lp:~renatofilho/address-book-app/search updated on 2014-06-09

232. By Renato Araujo Oliveira Filho on 2014-06-09: Removed unused signal.

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-06-09:

#

looks good now.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2014-06-09:

#

review: Approve (continuous-integration)

address-book-app

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

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'README.click'
 --- README.click	2013-12-16 15:04:12 +0000
 +++ README.click	2014-06-09 17:04:25 +0000
@@ -7,8 +7,8 @@
  cd build
  cmake [path_to_this_location] -DCLICK_MODE=on \
      -DBZR_REVNO=$(cd [path_to_this_location]; bzr revno)
--make DESTDIR=package install
--click build package
++make DESTDIR=[package dir] install
++click build [package dir]
  This package can be installed by running:
 === modified file 'debian/control'
 --- debian/control	2014-05-16 01:59:36 +0000
 +++ debian/control	2014-06-09 17:04:25 +0000
@@ -27,7 +27,6 @@
           qmlscene,
           qtcontact5-galera,
           qtdeclarative5-ubuntu-contacts0.1 (= ${binary:Version}),
--         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
           qtdeclarative5-ubuntu-telephony-phonenumber0.1,
           qtdeclarative5-ubuntu-content0.1,
           qtdeclarative5-ubuntu-keyboard-extensions0.1,
@@ -41,7 +40,7 @@
  Package: qtdeclarative5-ubuntu-contacts0.1
  Architecture: any
  Depends: qtdeclarative5-qtquick2-plugin,
--         qtdeclarative5-ubuntu-ui-toolkit-plugin | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
++         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
           qtdeclarative5-qtcontacts-plugin,
           ${misc:Depends},
           ${shlibs:Depends},
@@ -71,8 +70,9 @@
           libqt5test5,
           libqt5widgets5,
           python-testscenarios,
--         ubuntu-ui-toolkit-autopilot,
++         qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.10.20140527),
++         ubuntu-ui-toolkit-autopilot (>= 0.1.46+14.10.20140527),
           address-book-app (>= ${binary:Version}),
           ubuntu-mobile-icons,
  Description: Test package for address-book-app
-- Autopilot tests for the address-book-app package
++ Autopilot tests for the address-book-app package
 === modified file 'src/imports/Common/CMakeLists.txt'
 --- src/imports/Common/CMakeLists.txt	2014-05-08 18:10:28 +0000
 +++ src/imports/Common/CMakeLists.txt	2014-06-09 17:04:25 +0000
@@ -3,7 +3,9 @@
      ContactDetailItem.qml
      ContactDetailGroupBase.qml
      ContactDetailGroupWithTypeBase.qml
++    KeyboardRectangle.qml
      RemoveContactsDialog.qml
++    StandardAnimation.qml
+ )
  install(FILES ${CONTACT_COMMON_QMLS}
 === renamed file 'src/imports/ContactEdit/KeyboardRectangle.qml' => 'src/imports/Common/KeyboardRectangle.qml'
 === renamed file 'src/imports/ContactEdit/StandardAnimation.qml' => 'src/imports/Common/StandardAnimation.qml'
 === modified file 'src/imports/ContactEdit/CMakeLists.txt'
 --- src/imports/ContactEdit/CMakeLists.txt	2014-05-06 14:16:55 +0000
 +++ src/imports/ContactEdit/CMakeLists.txt	2014-06-09 17:04:25 +0000
@@ -11,8 +11,6 @@
      ContactDetailWithTypeEditor.qml
      ContactEditor.qml
      ContactFetchError.qml
--    KeyboardRectangle.qml
--    StandardAnimation.qml
      TextInputDetail.qml
      ValueSelector.qml
+ )
 === modified file 'src/imports/ContactList/ContactListPage.qml'
 --- src/imports/ContactList/ContactListPage.qml	2014-05-27 14:48:50 +0000
 +++ src/imports/ContactList/ContactListPage.qml	2014-06-09 17:04:25 +0000
@@ -32,8 +32,11 @@
      property bool pickMultipleContacts: false
      property var onlineAccountsMessageDialog: null
      property QtObject contactIndex: null
--    property bool syncEnabled: application.syncEnabled
--    property var contactModel: contactList.listModel ? contactList.listModel : null
++    property bool contactsLoaded: false
++
++    readonly property bool syncEnabled: application.syncEnabled
++    readonly property var contactModel: contactList.listModel ? contactList.listModel : null
++    readonly property bool searching: (state === "searching")
      function createEmptyContact(phoneNumber) {
          var details = [ {detail: "PhoneNumber", field: "number", value: phoneNumber},
@@ -111,13 +114,29 @@
          id: contactList
          objectName: "contactListView"
++        anchors {
++            top: parent.top
++            left: parent.left
++            bottom: keyboard.top
++            right: parent.right
++        }
++        swipeToDelete: !pickMode
          multiSelectionEnabled: true
          multipleSelection: !pickMode ||
                             ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
--        anchors.fill: parent
--        swipeToDelete: !pickMode
++        DetailFilter {
++            id: nameFilter
++
++            detail: ContactDetail.DisplayLabel
++            field: DisplayLabel.Label
++            value: searchField.text
++            matchFlags: DetailFilter.MatchContains
++        }
          onCountChanged: {
++            if (count > 0)
++                mainPage.contactsLoaded = true
++
              if ((count > 0) && mainPage.onlineAccountsMessageDialog) {
                  // Because of some contacts can take longer to arrive due the dbus delay,
                  // we need to destroy the online account dialog if this happen
@@ -128,6 +147,7 @@
+         }
          onContactClicked: {
++            mainPage.state = ""
              pageStack.push(Qt.resolvedUrl("../ContactView/ContactView.qml"),
                             {model: contactList.listModel,
                              contact: contact})
@@ -171,7 +191,9 @@
              anchors.centerIn: parent
              spacing: units.gu(2)
--            visible: (contactList.loading || application.syncing) && (contactList.count === 0)
++            visible: ((contactList.loading && !mainPage.contactsLoaded) ||
++                      (application.syncing && (contactList.count === 0)))
++
              ActivityIndicator {
                  id: activity
@@ -215,7 +237,6 @@
+         }
          ToolbarButton {
--
              action: Action {
                  objectName: "doneSelection"
                  text: mainPage.pickMode ? i18n.tr("Select") : i18n.tr("Delete")
@@ -240,9 +261,81 @@
                  onTriggered: application.startSync()
+             }
+         }
--    }
--
--    tools: contactList.isInSelectionMode ? toolbarItemsSelectionMode : toolbarItemsNormalMode
++        ToolbarButton {
++            objectName: "Search"
++            action: Action {
++                text: i18n.tr("Search")
++                visible: !mainPage.searching
++                iconName: "search"
++                onTriggered: {
++                    mainPage.state = "searching"
++                    searchField.forceActiveFocus()
++                }
++            }
++        }
++    }
++
++    ToolbarItems {
++        id: toolbarItemsSearch
++
++        visible: false
++        back: ToolbarButton {
++            visible: false
++            action: Action {
++                objectName: "cancelSearch"
++
++                visible: mainPage.searching
++                iconName: "back"
++                text: i18n.tr("Cancel")
++                onTriggered: mainPage.state = ""
++            }
++        }
++    }
++
++    TextField {
++        id: searchField
++
++        visible: mainPage.searching
++        anchors {
++            left: parent.left
++            leftMargin: units.gu(2)
++            right: parent.right
++            rightMargin: units.gu(2)
++            topMargin: units.gu(1.5)
++            bottomMargin: units.gu(1.5)
++            verticalCenter: parent.verticalCenter
++        }
++        onTextChanged: contactSearchTimeout.restart()
++        inputMethodHints: Qt.ImhNoPredictiveText
++    }
++
++    states: [
++        State {
++            name: ""
++            PropertyChanges {
++                target: searchField
++                text: ""
++            }
++        },
++        State {
++            name: "searching"
++            PropertyChanges {
++                target: mainPage
++                __customHeaderContents: searchField
++                tools: toolbarItemsSearch
++            }
++        },
++        State {
++            name: "selection"
++            when: contactList.isInSelectionMode
++            PropertyChanges {
++                target: mainPage
++                tools: toolbarItemsSelectionMode
++            }
++        }
++    ]
++
++    tools: toolbarItemsNormalMode
      // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves
      // see bug #1296764
@@ -304,6 +397,11 @@
+         }
+     }
++
++    KeyboardRectangle {
++        id: keyboard
++    }
++
      Connections {
          target: mainPage.contactModel
          onContactsChanged: {
@@ -331,6 +429,26 @@
+         }
+     }
++    Timer {
++        id: contactSearchTimeout
++
++        running: false
++        repeat: false
++        interval: 300
++        onTriggered: {
++            if (searchField.text === "") {
++                if (contactList.filter !== null) {
++                    contactList.changeFilter(null)
++                }
++            } else {
++                if (contactList.filter !== nameFilter) {
++                    contactList.changeFilter(nameFilter)
++                }
++                nameFilter.value = searchField.text
++            }
++        }
++    }
++
      Component.onCompleted: {
          if (pickMode) {
 === modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-05 19:20:12 +0000
 +++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-09 17:04:25 +0000
@@ -43,6 +43,14 @@
      property bool showFavourites: false
++    function changeFilter(newFilter)
++    {
++        if (root.count > 0) {
++            contactsModel._clearModel = true
++        }
++        root.filter = newFilter
++    }
++
      header: Rectangle {
          id: itemHeader
@@ -69,7 +77,12 @@
                  color: root.showFavourites ? UbuntuColors.warmGrey : UbuntuColors.orange
                  MouseArea {
                      anchors.fill: parent
--                    onClicked: root.showFavourites = false
++                    onClicked: {
++                        //WORKAROUND: clear the model before start populate it with the new contacts
++                        //otherwise the model will wait for all contacts before show any new contact
++                        root.changeFilter(root.filter)
++                        root.showFavourites = false
++                    }
+                 }
+             }
@@ -102,44 +115,67 @@
+         }
+     }
--    ContactModel {
--        id: allContactsModel
--
--        manager: root.manager
--        sortOrders: root.sortOrders
--        fetchHint: root.fetchHint
--
--        onErrorChanged: {
--            if (error) {
--                busyIndicator.busy = false
--                contactListView.error(error)
--            }
--        }
--    }
--
--    ContactModel {
--        id: favouritesContactsModel
--
--        manager: root.manager
--        sortOrders: root.sortOrders
--        fetchHint: root.fetchHint
--        filter: DetailFilter {
--            id: favouritesFilter
--
--            detail: ContactDetail.Favorite
--            field: Favorite.Favorite
--            value: true
--            matchFlags: DetailFilter.MatchExactly
--        }
--
--        onErrorChanged: {
--            if (error) {
--                busyIndicator.busy = false
--                contactListView.error(error)
--            }
--        }
--
--    }
--
--    listModel: showFavourites ? favouritesContactsModel : allContactsModel
++    DetailFilter {
++        id: favouritesFilter
++
++        detail: ContactDetail.Favorite
++        field: Favorite.Favorite
++        value: true
++        matchFlags: DetailFilter.MatchExactly
++    }
++
++    InvalidFilter {
++        id: invalidFilter
++    }
++
++    IntersectionFilter {
++        id: contactsFilter
++
++        filters: {
++            var filters = []
++            if (root.showFavourites) {
++                filters.push(favouritesFilter)
++            }
++            if (root.filter) {
++                filters.push(root.filter)
++            }
++            return filters
++        }
++    }
++
++    ContactModel {
++        id: contactsModel
++
++        property bool _clearModel: false
++
++        manager: root.manager
++        sortOrders: root.sortOrders
++        fetchHint: root.fetchHint
++        filter: {
++            if (contactsModel._clearModel) {
++                return invalidFilter
++            } else if (root.showFavourites || root.filter) {
++                return contactsFilter
++            } else {
++                return null
++            }
++        }
++        onErrorChanged: {
++            if (error) {
++                console.error("Contact List error:" + error)
++            }
++        }
++        onContactsChanged: {
++            //WORKAROUND: clear the model before start populate it with the new contacts
++            //otherwise the model will wait for all contacts before show any new contact
++
++            //after all contacts get removed we can populate the model again, this will show
++            //new contacts as soon as it arrives in the model
++            if (contactsModel._clearModel && contacts.length === 0) {
++                contactsModel._clearModel = false
++            }
++        }
++    }
++
++    listModel: contactsModel
+ }
 === modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
 --- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-05 19:20:12 +0000
 +++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-09 17:04:25 +0000
@@ -88,8 +88,6 @@
      */
      property list<SortOrder> sortOrders : [
          SortOrder {
--            id: sortOrder
--
              detail: ContactDetail.Tag
              field: Tag.Tag
              direction: Qt.AscendingOrder