Merge lp:~elopio/address-book-app/workaround1327325-warning_to_file into lp:address-book-app

[Leo Arias]

Log warnings to a file temporary, because of bug 1327325.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/586/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/735
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/679
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1161
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1379
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1379/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/606
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/818
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/818/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2014-05-13 18:53:02 +0000
+++ debian/control	2014-06-06 17:32:09 +0000
@@ -73,5 +73,6 @@
          python-testscenarios,
          ubuntu-ui-toolkit-autopilot,
          address-book-app (>= ${binary:Version}),
+         ubuntu-mobile-icons,
 Description: Test package for address-book-app
  Autopilot tests for the address-book-app package

=== modified file 'src/imports/Common/CMakeLists.txt'
--- src/imports/Common/CMakeLists.txt	2013-07-31 19:36:55 +0000
+++ src/imports/Common/CMakeLists.txt	2014-06-06 17:32:09 +0000
@@ -3,6 +3,7 @@
     ContactDetailItem.qml
     ContactDetailGroupBase.qml
     ContactDetailGroupWithTypeBase.qml
+    RemoveContactsDialog.qml
 )
 
 install(FILES ${CONTACT_COMMON_QMLS}

=== modified file 'src/imports/Common/ContactDetailBase.qml'
--- src/imports/Common/ContactDetailBase.qml	2014-05-06 13:18:07 +0000
+++ src/imports/Common/ContactDetailBase.qml	2014-06-06 17:32:09 +0000
@@ -19,7 +19,6 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
-
 ListItem.Empty {
     id: root
     objectName: detail ? "base_" + detailToString(detail.type, -1) + "_" + index : ""
@@ -94,7 +93,6 @@
     }
 
     highlightWhenPressed: false
-    focus: false
 
     Rectangle {
         anchors.fill: parent

=== modified file 'src/imports/Common/ContactDetailGroupBase.qml'
--- src/imports/Common/ContactDetailGroupBase.qml	2014-05-06 13:18:07 +0000
+++ src/imports/Common/ContactDetailGroupBase.qml	2014-06-06 17:32:09 +0000
@@ -129,7 +129,6 @@
             Loader {
                 id: detailItem
 
-                focus: true
                 sourceComponent: root.detailDelegate
                 Binding {
                     target: detailItem.item
@@ -149,24 +148,14 @@
                         newFields.push(detailItem.item)
                         root.newFieldAdded(detailItem.item)
                         root.inputFields = newFields
-                        if (item.focus && root.loaded && root.focus) {
+                        if (root.loaded) {
                             item.forceActiveFocus()
                         }
                     }
                 }
-                activeFocusOnTab: true
             }
         }
     }
 
     Component.onCompleted: root.loaded = true
-
-    // reset focus back to first field
-    onActiveFocusChanged: {
-        if (!activeFocus) {
-            for(var i=0; i < detailFields.count; i++) {
-                detailFields.itemAt(i).focus = (i === 0)
-            }
-        }
-    }
 }

=== modified file 'src/imports/Common/ContactDetailItem.qml'
--- src/imports/Common/ContactDetailItem.qml	2014-05-06 17:19:55 +0000
+++ src/imports/Common/ContactDetailItem.qml	2014-06-06 17:32:09 +0000
@@ -25,7 +25,6 @@
     property Component fieldDelegate: null
 
     implicitHeight: fieldsColumn.height
-
     Column {
         id: fieldsColumn
 
@@ -42,10 +41,8 @@
             model: root.fields
             Loader {
                 id: field
-                focus: true
 
                 sourceComponent: fieldDelegate
-
                 Binding {
                     target: item
                     property: "field"
@@ -57,18 +54,6 @@
                     property: "detail"
                     value: root.detail
                 }
-
-                KeyNavigation.backtab : index > 0 ? fieldRepeater.itemAt(index - 1) : null
-                KeyNavigation.tab: index < fieldRepeater.count - 1 ? fieldRepeater.itemAt(index + 1) : null
-            }
-        }
-    }
-
-    // reset focus back to first field
-    onActiveFocusChanged: {
-        if (!activeFocus) {
-            for(var i=0; i < fieldRepeater.count; i++) {
-                fieldRepeater.itemAt(i).focus = (i === 0)
             }
         }
     }

=== added file 'src/imports/Common/RemoveContactsDialog.qml'
--- src/imports/Common/RemoveContactsDialog.qml	1970-01-01 00:00:00 +0000
+++ src/imports/Common/RemoveContactsDialog.qml	2014-06-06 17:32:09 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.2
+import Ubuntu.Components 0.1
+import Ubuntu.Components.Popups 0.1 as Popups
+
+Popups.Dialog {
+    objectName: "removeContactsDialog"
+
+    property var contacts: []
+
+    signal canceled()
+    signal accepted()
+
+    function removeContacts(model)
+    {
+        var ids = []
+        for(var i=0, iMax=contacts.length; i < iMax; i++) {
+            ids.push(contacts[i].contactId)
+        }
+        model.removeContacts(ids)
+    }
+
+    title: {
+        if (contacts.length == 0) {
+            return i18n.tr("No contact selected.")
+        } else if (contacts.length == 1)  {
+            return contacts[0].displayLabel.label
+        } else {
+            return i18n.tr("Multiple contacts")
+        }
+    }
+    text: {
+        if (contacts.length == 1)  {
+            return i18n.tr("Are you sure that you want to remove this contact?")
+        } else {
+            return i18n.tr("Are you sure that you want to remove all selected contacts?")
+        }
+    }
+
+    Button {
+        objectName: "removeContactsDialog.Yes"
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(1)
+        }
+        text: i18n.tr("Yes")
+        onClicked: accepted()
+    }
+
+    Button {
+        objectName: "removeContactsDialog.No"
+        anchors {
+            left: parent.left
+            right: parent.right
+            margins: units.gu(1)
+        }
+        gradient: UbuntuColors.greyGradient
+        text: i18n.tr("No")
+        onClicked: canceled()
+    }
+}

=== modified file 'src/imports/ContactEdit/CMakeLists.txt'
--- src/imports/ContactEdit/CMakeLists.txt	2014-03-05 22:22:01 +0000
+++ src/imports/ContactEdit/CMakeLists.txt	2014-06-06 17:32:09 +0000
@@ -11,7 +11,6 @@
     ContactDetailWithTypeEditor.qml
     ContactEditor.qml
     ContactFetchError.qml
-    EditToolbar.qml
     KeyboardRectangle.qml
     StandardAnimation.qml
     TextInputDetail.qml

=== modified file 'src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-05-13 18:53:02 +0000
+++ src/imports/ContactEdit/ContactDetailGroupWithTypeEditor.qml	2014-06-06 17:32:09 +0000
@@ -95,8 +95,6 @@
 
         return changed
     }
-
-    activeFocusOnTab: detailsCount > 0
     minimumHeight: units.gu(5)
     headerDelegate: ListItem.Empty {
         id: header
@@ -130,7 +128,6 @@
             }
             width: units.gu(2)
             height: units.gu(2)
-            color: "white"
             name: "add"
         }
 

=== modified file 'src/imports/ContactEdit/ContactDetailNameEditor.qml'
--- src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-05-08 15:45:48 +0000
+++ src/imports/ContactEdit/ContactDetailNameEditor.qml	2014-06-06 17:32:09 +0000
@@ -74,6 +74,7 @@
             root.emptyFields = newEmtpyFields
         }
 
+        focus: true
         width: root.width - units.gu(4)
         x: units.gu(2)
         detail: root.detail

=== modified file 'src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml'
--- src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-05-20 14:56:42 +0000
+++ src/imports/ContactEdit/ContactDetailSyncTargetEditor.qml	2014-06-06 17:32:09 +0000
@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright (C) 2012-2013 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,6 +24,8 @@
 ContactDetailBase {
     id: root
 
+    property bool active: false
+
     function save() {
         // only changes the target sync for new contacts
         if (!isNewContact) {
@@ -41,7 +43,7 @@
     }
 
     function getSelectedSource() {
-        var selectedContact = sourceModel.contacts[sources.selectedIndex]
+        var selectedContact = sources.model.contacts[sources.selectedIndex]
         if (selectedContact) {
             return selectedContact.guid.guid
         } else {
@@ -53,7 +55,8 @@
     property real myHeight: sources.containerHeight + units.gu(4) + label.height
 
     detail: contact ? contact.detail(ContactDetail.SyncTarget) : null
-    implicitHeight: isNewContact && (sourceModel.contacts.length > 1) ? myHeight : 0
+    implicitHeight: isNewContact &&  sources.model && (sources.model.contacts.length > 1) ? myHeight : 0
+
 
     ContactModel {
         id: sourceModel
@@ -65,6 +68,7 @@
             value: Type.Group
             matchFlags: DetailFilter.MatchExactly
         }
+        autoUpdate: false
     }
 
     Label {
@@ -77,12 +81,13 @@
             right: parent.right
             margins: units.gu(2)
         }
-        height: root.active ? units.gu(4) : units.gu(3)
+        height: units.gu(4)
     }
 
     OptionSelector {
         id: sources
 
+        model: sourceModel
         anchors {
             left: parent.left
             leftMargin: units.gu(2)
@@ -94,13 +99,19 @@
             bottomMargin: units.gu(2)
         }
 
-        model: sourceModel
         delegate: OptionSelectorDelegate {
             text: contact.displayLabel.label
             height: units.gu(5)
         }
 
-        containerHeight: sourceModel.contacts.length > 4 ? itemHeight * 4 : itemHeight * sourceModel.contacts.length
-    }
+        containerHeight: sources.model && sources.model.contacts.length > 4 ? itemHeight * 4 : sources.model ? itemHeight * sources.model.contacts.length : 0
+    }
+
+    onActiveChanged: {
+        if (active) {
+            sourceModel.update()
+        }
+    }
+
 }
 

=== modified file 'src/imports/ContactEdit/ContactDetailWithTypeEditor.qml'
--- src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-05-13 18:53:02 +0000
+++ src/imports/ContactEdit/ContactDetailWithTypeEditor.qml	2014-06-06 17:32:09 +0000
@@ -68,7 +68,6 @@
         return detailchanged
     }
 
-    focus: true
     // disable listview mouse area
     __mouseArea.visible: false
     enabled: root.detail ? !root.detail.readOnly : false
@@ -107,22 +106,19 @@
             right: detailTypeSelector.right
             top: detailTypeSelector.bottom
         }
-        focus: true
         height: childrenRect.height
 
         Repeater {
             id: fieldRepeater
+
             model: root.fields
-
-            focus: true
             TextInputDetail {
                 id: detail
                 objectName: root.detail ? detailToString(root.detail.type, modelData) + "_" + root.index : ""
 
-                Component.onCompleted: focus = (index === 0)
-                focus: false
                 detail: root.detail
                 field: modelData
+                focus: true
                 placeholderText: root.placeholderTexts[index]
                 inputMethodHints: root.inputMethodHints
                 autoFormat: root.usePhoneFormat
@@ -133,9 +129,6 @@
                 }
                 height: root.active ? root.itemHeight + units.gu(1) : root.itemHeight
                 onRemoveClicked: root.contact.removeDetail(root.detail)
-                // FIXME: SDK still using QtQuick 2.0 change this to activeFocusOnTab: true on version 2.2
-                KeyNavigation.backtab : index > 0 ? fieldRepeater.itemAt(index - 1) : null
-                KeyNavigation.tab: index < fieldRepeater.count - 1 ? fieldRepeater.itemAt(index + 1) : null
             }
         }
         Keys.onReleased: {
@@ -148,13 +141,4 @@
             }
         }
     }
-
-    // reset focus back to first field
-    onActiveFocusChanged: {
-        if (!activeFocus) {
-            for(var i=0; i < fieldRepeater.count; i++) {
-                fieldRepeater.itemAt(i).focus = (i === 0)
-            }
-        }
-    }
 }

=== modified file 'src/imports/ContactEdit/ContactEditor.qml'
--- src/imports/ContactEdit/ContactEditor.qml	2014-05-08 15:45:48 +0000
+++ src/imports/ContactEdit/ContactEditor.qml	2014-06-06 17:32:09 +0000
@@ -21,25 +21,23 @@
 import Ubuntu.Components.Popups 0.1
 import Ubuntu.Contacts 0.1 as ContactsUI
 
+import "../Common"
+
 Page {
     id: contactEditor
     objectName: "contactEditorPage"
 
     property QtObject contact: null
     property alias model: contactFetch.model
+    property QtObject activeItem: null
     readonly property  bool isNewContact: contact && (contact.contactId === "qtcontacts:::")
 
     // this is used to add a phone number to a existing contact
     property string contactId: ""
     property string newPhoneNumber: ""
 
-    property QtObject activeItem: null
-
-    // we use a custom toolbar in this view
-    tools: ToolbarItems {
-        locked: true
-        opened: false
-    }
+    // priv
+    property bool _edgeReady: false
 
     function cancel() {
         for(var i = 0; i < contents.children.length; ++i) {
@@ -90,22 +88,22 @@
     }
 
     function makeMeVisible(item) {
-        if (!item) {
+        if (!_edgeReady || !item) {
             return
         }
 
         activeItem = item
-        var position = scrollArea.contentItem.mapFromItem(item, 0, item.y);
+        var position = scrollArea.contentItem.mapFromItem(item, 0, activeItem.y);
 
         // check if the item is already visible
         var bottomY = scrollArea.contentY + scrollArea.height
-        var itemBottom = position.y + item.height
+        var itemBottom = position.y + (item.height * 3) // extra margin
         if (position.y >= scrollArea.contentY && itemBottom <= bottomY) {
             return;
         }
 
         // if it is not, try to scroll and make it visible
-        var targetY = position.y + item.height - scrollArea.height
+        var targetY = itemBottom - scrollArea.height
         if (targetY >= 0 && position.y) {
             scrollArea.contentY = targetY;
         } else if (position.y < scrollArea.contentY) {
@@ -115,6 +113,17 @@
         scrollArea.returnToBounds()
     }
 
+    function ready()
+    {
+        enabled = true
+        if (isNewContact) {
+            _edgeReady = true
+            nameEditor.fieldDelegates[0].forceActiveFocus()
+        }
+    }
+
+    title: i18n.tr("Edit")
+
     ContactFetchError {
         id: fetchErrorDialog
     }
@@ -135,6 +144,7 @@
 
         interval: 200
         running: false
+        repeat: false
         onTriggered: {
             // get last phone field and set focus
             var lastPhoneField = phonesEditor.detailDelegates[phonesEditor.detailDelegates.length - 2].item
@@ -142,23 +152,19 @@
         }
     }
 
-    flickable: null
     Flickable {
         id: scrollArea
         objectName: "scrollArea"
 
         flickableDirection: Flickable.VerticalFlick
         anchors {
-            left: parent.left
-            right: parent.right
-            top: parent.top
-            bottom: toolbar.top
-            bottomMargin: units.gu(2)
+            fill: parent
+            bottomMargin: keyboard.height
         }
         contentHeight: contents.height
         contentWidth: parent.width
 
-        // after add a new field we need to wait for the contentHeight to change to scroll to the correct position
+        //after add a new field we need to wait for the contentHeight to change to scroll to the correct position
         onContentHeightChanged: contactEditor.makeMeVisible(contactEditor.activeItem)
 
         Column {
@@ -166,37 +172,21 @@
 
             anchors {
                 top: parent.top
-                topMargin: units.gu(2)
                 left: parent.left
                 right: parent.right
             }
             height: childrenRect.height
 
-            // WORKAROUND: SDK does not support QtQuick 2.2 properties yet, because of that we need create
-            // a external element and that allow us to use activeFocusOnTab
-            // FIXME: Remove FocusScope element as soon as the SDK get support for QtQuick 2.2
-            FocusScope {
-                function save() {
-                    return nameEditor.save()
-                }
-
-                function isEmpty() {
-                    return nameEditor.cancel()
-                }
-
-                activeFocusOnTab: true
+            ContactDetailNameEditor {
+                id: nameEditor
+
+
                 anchors {
                     left: parent.left
                     right: parent.right
                 }
                 height: nameEditor.implicitHeight + units.gu(3)
-
-                ContactDetailNameEditor {
-                    id: nameEditor
-
-                    contact: contactEditor.contact
-                    anchors.fill: parent
-                }
+                contact: contactEditor.contact
             }
 
             ContactDetailAvatarEditor {
@@ -273,6 +263,7 @@
             ContactDetailSyncTargetEditor {
                 id: syncTargetEditor
 
+                active: contactEditor.active
                 contact: contactEditor.contact
                 anchors {
                     left: parent.left
@@ -280,25 +271,33 @@
                 }
                 height: implicitHeight
             }
-        }
-    }
-
-    EditToolbar {
-        id: toolbar
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: keyboard.top
-        }
-        height: units.gu(6)
-        acceptAction: Action {
-            text: i18n.tr("Save")
-            enabled: !nameEditor.isEmpty() || !phonesEditor.isEmpty()
-            onTriggered: contactEditor.save()
-        }
-        rejectAction: Action {
-            text: i18n.tr("Cancel")
-            onTriggered: contactEditor.cancel()
+
+            // We need this extra element to correct align the deleteButton
+            Item {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                height: deleteButton.height + units.gu(2)
+
+                Button {
+                    id: deleteButton
+
+                    text: i18n.tr("Delete")
+                    visible: !contactEditor.isNewContact
+                    anchors {
+                        margins: units.gu(2)
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                    }
+
+                    onClicked: {
+                        var dialog = PopupUtils.open(removeContactDialog, null)
+                        dialog.contacts = [contactEditor.contact]
+                    }
+                }
+            }
         }
     }
 
@@ -312,6 +311,34 @@
         }
     }
 
+    tools: ToolbarItems {
+        id: toolbar
+
+        back: ToolbarButton {
+            action: Action {
+                objectName: "cancel"
+
+                iconName: "close"
+                text: i18n.tr("Cancel")
+                onTriggered: {
+                    contactEditor.cancel()
+                    contactEditor.active = false
+                }
+            }
+        }
+
+        ToolbarButton {
+            action: Action {
+                objectName: "save"
+
+                iconName: "save"
+                text: i18n.tr("Save")
+                enabled: !nameEditor.isEmpty() || !phonesEditor.isEmpty()
+                onTriggered: contactEditor.save()
+            }
+        }
+    }
+
     // This will load the contact information and add the new phone number
     // when the app was launched with the URI: addressbook:///addphone?id=<contact-id>&phone=<phone-number>
     onContactChanged: {
@@ -334,4 +361,32 @@
             nameEditor.forceActiveFocus()
         }
     }
+
+    Component {
+        id: removeContactDialog
+
+        RemoveContactsDialog {
+            id: removeContactsDialogMessage
+
+            property var popPages: false
+
+            onCanceled: {
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            onAccepted: {
+                popPages = true
+                removeContacts(contactEditor.model)
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            // WORKAROUND: SDK element crash if pop the page where the dialog was created
+            Component.onDestruction: {
+                if (popPages) {
+                    contactEditor.pageStack.pop() // editor page
+                    contactEditor.pageStack.pop() // view page
+                }
+            }
+        }
+    }
 }

=== removed file 'src/imports/ContactEdit/EditToolbar.qml'
--- src/imports/ContactEdit/EditToolbar.qml	2014-05-08 15:46:09 +0000
+++ src/imports/ContactEdit/EditToolbar.qml	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.2
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-Rectangle {
-    id: root
-
-    signal reject()
-    signal accept()
-
-    property alias acceptAction: accept.action
-    property alias rejectAction: reject.action
-
-    color: "gray"
-
-    // WORKAROUND: avoid the mouse click get stolen by the Flickable area
-    MouseArea {
-        anchors.fill: parent
-    }
-
-    Button {
-        id: reject
-        objectName: "reject"
-
-        action: Action {
-            text: i18n.tr("Cancel")
-        }
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        onClicked: root.reject()
-    }
-
-    Button {
-        id: accept
-        objectName: "accept"
-
-        action: Action {
-            text: i18n.tr("Done")
-        }
-        anchors {
-            right: parent.right
-            rightMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-        onClicked: root.accept()
-    }
-}

=== modified file 'src/imports/ContactEdit/TextInputDetail.qml'
--- src/imports/ContactEdit/TextInputDetail.qml	2014-05-16 20:30:35 +0000
+++ src/imports/ContactEdit/TextInputDetail.qml	2014-06-06 17:32:09 +0000
@@ -22,48 +22,76 @@
 //style
 import Ubuntu.Components.Themes.Ambiance 0.1
 
-PhoneNumberField {
+FocusScope {
     id: root
 
     property QtObject detail
     property int field: -1
     property variant originalValue: root.detail && (root.field >= 0) ? root.detail.value(root.field) : null
 
+    // proxy textField
+    property alias font: field.font
+    property alias placeholderText: field.placeholderText
+    property alias inputMethodHints: field.inputMethodHints
+    property alias text: field.text
+    property alias hasClearButton: field.hasClearButton
+    // proxy PhoneNumberField
+    property alias autoFormat: field.autoFormat
+
     signal removeClicked()
 
-    // TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
-    // the supported values can be found in: https://www.iso.org/obp/ui/#search
-    defaultRegion: i18n.tr("US")
-    autoFormat: false
-
-    // Ubuntu.Keyboard
-    InputMethod.extensions: { "enterKeyText": i18n.tr("Next") }
-
-    readOnly: detail ? detail.readOnly : true
-    focus: true
-    style: TextFieldStyle {
-        overlaySpacing: 0
-        frameSpacing: 0
-        background: Item {}
+    //FIXME: Move this property to TextField as soon as the SDK get ported to QtQuick 2.2
+    activeFocusOnTab: true
+
+    // WORKAROUND: For some reason TextField.focus property get reset to false
+    // we need do a deep investigation on that
+    Binding {
+        target: field
+        property: "focus"
+        value: visible
     }
 
-    Component.onCompleted: makeMeVisible(root)
-    onActiveFocusChanged: {
-        if (activeFocus) {
-            makeMeVisible(root)
+    onActiveFocusChanged:  {
+        if (activeFocus && field.visible) {
+            field.forceActiveFocus()
         }
     }
 
-    // default style
-    font {
-        family: "Ubuntu"
-        pixelSize: activeFocus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
-    }
-
-    Keys.onReturnPressed: application.sendTabEvent();
     onOriginalValueChanged: {
         if (originalValue && (originalValue !== "")) {
-            text = originalValue
-        }
+            field.text = originalValue
+        }
+    }
+
+    PhoneNumberField {
+        id: field
+
+        anchors.fill: parent
+
+        // TRANSLATORS: This value is used as default value for phone number format, when no coutry code is provided
+        // the supported values can be found in: https://www.iso.org/obp/ui/#search
+        defaultRegion: i18n.tr("US")
+        autoFormat: false
+
+        // Ubuntu.Keyboard
+        InputMethod.extensions: { "enterKeyText": i18n.tr("Next") }
+        readOnly: root.detail ? root.detail.readOnly : true
+        style: TextFieldStyle {
+            overlaySpacing: 0
+            frameSpacing: 0
+            background: Item {}
+        }
+        onActiveFocusChanged: {
+            if (activeFocus) {
+                makeMeVisible(root)
+            }
+        }
+
+        // default style
+        font {
+            family: "Ubuntu"
+            pixelSize: activeFocus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
+        }
+        Keys.onReturnPressed: application.sendTabEvent();
     }
 }

=== modified file 'src/imports/ContactList/CMakeLists.txt'
--- src/imports/ContactList/CMakeLists.txt	2014-02-18 14:09:02 +0000
+++ src/imports/ContactList/CMakeLists.txt	2014-06-06 17:32:09 +0000
@@ -2,6 +2,7 @@
     ContactListPage.qml
     ContactExporter.qml
     OnlineAccountsMessage.qml
+    PageWithBottomEdge.qml
 )
 
 install(FILES ${CONTACT_LIST_QMLS}

=== modified file 'src/imports/ContactList/ContactListPage.qml'
--- src/imports/ContactList/ContactListPage.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactList/ContactListPage.qml	2014-06-06 17:32:09 +0000
@@ -21,8 +21,10 @@
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Contacts 0.1 as ContactsUI
 import Ubuntu.Components.Popups 0.1 as Popups
+import "../ContactEdit"
+import "../Common"
 
-Page {
+PageWithBottomEdge {
     id: mainPage
     objectName: "contactListPage"
 
@@ -54,7 +56,20 @@
         return newContact
     }
 
-    title: i18n.tr("Contacts")
+    title: contactList.isInSelectionMode ? i18n.tr("Select Contacts") : i18n.tr("Contacts")
+
+    //bottom edge page
+    bottomEdgePageComponent: ContactEditor {
+        //WORKAROUND: SKD changes the page header as soon as the page get created
+        // setting active false will avoid that
+        active: false
+        enabled: false
+
+        model: contactList.listModel
+        contact: mainPage.createEmptyContact("")
+    }
+    bottomEdgeTitle: "+"
+    bottomEdgeEnabled: !contactList.isInSelectionMode
 
     Component {
         id: onlineAccountsDialog
@@ -75,21 +90,31 @@
         }
     }
 
+    Component {
+        id: removeContactDialog
+
+        RemoveContactsDialog {
+            id: removeContactsDialogMessage
+
+            onCanceled: {
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+
+            onAccepted: {
+                removeContacts(contactList.listModel)
+                PopupUtils.close(removeContactsDialogMessage)
+            }
+        }
+    }
+
     ContactsUI.ContactListView {
         id: contactList
         objectName: "contactListView"
 
         multiSelectionEnabled: true
-        acceptAction.text: pickMode ? i18n.tr("Select") : i18n.tr("Delete")
         multipleSelection: !pickMode ||
                            ((contactContentHub && contactContentHub.multipleItems) || mainPage.pickMultipleContacts)
-        anchors {
-            // This extra margin is necessary because the toolbar area overlaps the last item in the view
-            // in the selection mode we remove it to avoid visual problems due the selection bar appears
-            // inside of the listview
-            bottomMargin: contactList.isInSelectionMode ? 0 : units.gu(2)
-            fill: parent
-        }
+        anchors.fill: parent
         swipeToDelete: !pickMode
 
         onCountChanged: {
@@ -118,11 +143,14 @@
                 exporter.contacts = contacts
                 exporter.start()
             } else {
-                var ids = []
-                for (var i=0; i < items.count; i++) {
-                    ids.push(items.get(i).model.contact.contactId)
+                var contacts = []
+
+                for (var i=0, iMax=items.count; i < iMax; i++) {
+                    contacts.push(items.get(i).model.contact)
                 }
-                contactList.listModel.removeContacts(ids)
+
+                var dialog = PopupUtils.open(removeContactDialog, null)
+                dialog.contacts = contacts
             }
         }
 
@@ -136,15 +164,8 @@
             }
         }
 
-        onIsInSelectionModeChanged: {
-            if (isInSelectionMode) {
-                toolbar.opened = false
-            }
-        }
-
         onError: pageStack.contactModelError(error)
 
-
         Column {
             id: indicator
 
@@ -165,42 +186,64 @@
         }
     }
 
-    tools: ToolbarItems {
-        id: toolbar
-
-        locked: contactList.isInSelectionMode
+    ToolbarItems {
+        id: toolbarItemsSelectionMode
+
+        visible: false
+        back: ToolbarButton {
+            action: Action {
+                text: i18n.tr("Cancel selection")
+                iconName: "close"
+                onTriggered: contactList.cancelSelection()
+            }
+        }
+
+        ToolbarButton {
+            action: Action {
+                objectName: "selectAll"
+                text: i18n.tr("Select All")
+                iconName: "filter"
+                onTriggered: {
+                    if (contactList.selectedItems.count == contactList.count) {
+                        contactList.clearSelection()
+                    } else {
+                        contactList.selectAll()
+                    }
+                }
+                visible: contactList.isInSelectionMode
+            }
+        }
+
+        ToolbarButton {
+
+            action: Action {
+                objectName: "doneSelection"
+                text: mainPage.pickMode ? i18n.tr("Select") : i18n.tr("Delete")
+                iconName: mainPage.pickMode ? "select" : "delete"
+                onTriggered: contactList.endSelection()
+                visible: contactList.isInSelectionMode
+            }
+        }
+    }
+
+    ToolbarItems {
+        id: toolbarItemsNormalMode
+
+        visible: false
         ToolbarButton {
             objectName: "Sync"
-            visible: mainPage.syncEnabled
             action: Action {
+                visible: mainPage.syncEnabled
                 text: application.syncing ? i18n.tr("Syncing") : i18n.tr("Sync")
                 iconName: "reload"
                 enabled: !application.syncing
                 onTriggered: application.startSync()
             }
         }
-        ToolbarButton {
-            action: Action {
-                objectName: "selectButton"
-                text: i18n.tr("Select")
-                iconName: "select"
-                onTriggered: contactList.startSelection()
-            }
-        }
-        ToolbarButton {
-            objectName: "Add"
-            action: Action {
-                text: i18n.tr("Add")
-                iconName: "add"
-                onTriggered: {
-                    var newContact = mainPage.createEmptyContact("")
-                    pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                                   {model: contactList.listModel, contact: newContact})
-                }
-            }
-        }
     }
 
+    tools: contactList.isInSelectionMode ? toolbarItemsSelectionMode : toolbarItemsNormalMode
+
     // WORKAROUND: Avoid the gap btw the header and the contact list when the list moves
     // see bug #1296764
     onActiveChanged: {
@@ -217,6 +260,19 @@
         }
     }
 
+    // We need to reset the page proprerties in case of the page was created pre-populated,
+    // with phonenumber or contact.
+    onBottomEdgeDismissed: {
+        //WORKAROUND: SKD changes the page header as soon as the page get created
+        // setting active false will avoid that
+        var newContact = mainPage.createEmptyContact("")
+        mainPage.setBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                   {model: contactList.listModel,
+                                    contact: newContact,
+                                    active: false,
+                                    enabled: false})
+    }
+
     Connections {
         target: pageStack
         onContactRequested: {
@@ -225,12 +281,23 @@
         }
         onCreateContactRequested: {
             var newContact = mainPage.createEmptyContact(phoneNumber)
-            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                           {model: contactList.listModel, contact: newContact})
+            //WORKAROUND: SKD changes the page header as soon as the page get created
+            // setting active false will avoid that
+            mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                        {model: contactList.listModel,
+                                         contact: newContact,
+                                         active: false,
+                                         enabled: false})
         }
         onEditContatRequested: {
-            pageStack.push(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
-                           {model: contactList.listModel, contactId: contactId, newPhoneNumber: phoneNumber })
+            //WORKAROUND: SKD changes the page header as soon as the page get created
+            // setting active false will avoid that
+            mainPage.showBottomEdgePage(Qt.resolvedUrl("../ContactEdit/ContactEditor.qml"),
+                                       {model: contactList.listModel,
+                                        contactId: contactId,
+                                        newPhoneNumber: phoneNumber,
+                                        active: false,
+                                        enabled: false})
         }
         onContactCreated: {
             mainPage.contactIndex = contact

=== added file 'src/imports/ContactList/PageWithBottomEdge.qml'
--- src/imports/ContactList/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ContactList/PageWithBottomEdge.qml	2014-06-06 17:32:09 +0000
@@ -0,0 +1,355 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+    Example:
+
+    MainView {
+        objectName: "mainView"
+
+        applicationName: "com.ubuntu.developer.boiko.bottomedge"
+
+        width: units.gu(100)
+        height: units.gu(75)
+
+        Component {
+            id: pageComponent
+
+            PageWithBottomEdge {
+                id: mainPage
+                title: i18n.tr("Main Page")
+
+                Rectangle {
+                    anchors.fill: parent
+                    color: "white"
+                }
+
+                bottomEdgePageComponent: Page {
+                    title: "Contents"
+                    anchors.fill: parent
+                    //anchors.topMargin: contentsPage.flickable.contentY
+
+                    ListView {
+                        anchors.fill: parent
+                        model: 50
+                        delegate: ListItems.Standard {
+                            text: "One Content Item: " + index
+                        }
+                    }
+                }
+                bottomEdgeTitle: i18n.tr("Bottom edge action")
+            }
+        }
+
+        PageStack {
+            id: stack
+            Component.onCompleted: stack.push(pageComponent)
+        }
+    }
+
+*/
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+
+Page {
+    id: page
+
+    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
+    property alias bottomEdgePageSource: edgeLoader.source
+    property alias bottomEdgeTitle: tipLabel.text
+    property alias bottomEdgeEnabled: bottomEdge.visible
+    property int bottomEdgeExpandThreshold: page.height * 0.2
+    property int bottomEdgeExposedArea: bottomEdge.state !== "expanded" ? (page.height - bottomEdge.y - bottomEdge.tipHeight) : _areaWhenExpanded
+    property bool reloadBottomEdgePage: true
+
+    readonly property alias bottomEdgePage: edgeLoader.item
+    readonly property bool isReady: (tip.opacity === 0.0)
+    readonly property bool isCollapsed: (tip.opacity === 1.0)
+    readonly property bool bottomEdgePageLoaded: (edgeLoader.status == Loader.Ready)
+
+    property bool _showEdgePageWhenReady: false
+    property int _areaWhenExpanded: 0
+
+    signal bottomEdgeReleased()
+    signal bottomEdgeDismissed()
+
+
+    function showBottomEdgePage(source, properties)
+    {
+        edgeLoader.setSource(source, properties)
+        _showEdgePageWhenReady = true
+    }
+
+    function setBottomEdgePage(source, properties)
+    {
+        edgeLoader.setSource(source, properties)
+    }
+
+    function _pushPage()
+    {
+        if (edgeLoader.status === Loader.Ready) {
+            edgeLoader.item.active = true
+            page.pageStack.push(edgeLoader.item)
+            if (edgeLoader.item.flickable) {
+                edgeLoader.item.flickable.contentY = -page.header.height
+                edgeLoader.item.flickable.returnToBounds()
+            }
+            if (edgeLoader.item.ready)
+                edgeLoader.item.ready()
+        }
+    }
+
+
+    Component.onCompleted: {
+        // avoid a binding on the expanded height value
+        var expandedHeight = height;
+        _areaWhenExpanded = expandedHeight;
+    }
+
+    onActiveChanged: {
+        if (active) {
+            bottomEdge.state = "collapsed"
+        }
+    }
+
+    onBottomEdgePageLoadedChanged: {
+        if (_showEdgePageWhenReady && bottomEdgePageLoaded) {
+            bottomEdge.state = "expanded"
+            _showEdgePageWhenReady = false
+        }
+    }
+
+    Rectangle {
+        id: bgVisual
+
+        color: "black"
+        anchors.fill: page
+        opacity: 0.7 * ((page.height - bottomEdge.y) / page.height)
+        z: 1
+    }
+
+    Rectangle {
+        id: bottomEdge
+        objectName: "bottomEdge"
+
+        readonly property int tipHeight: units.gu(3)
+        readonly property int pageStartY: 0
+
+        z: 1
+        color: Theme.palette.normal.background
+        parent: page
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        height: page.height
+        y: height
+
+        Rectangle {
+            id: shadow
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(1)
+            y: -height
+            opacity: 0.0
+            gradient: Gradient {
+                GradientStop { position: 0.0; color: "transparent" }
+                GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
+            }
+        }
+
+        Item {
+            id: tipContainer
+            objectName: "bottomEdgeTip"
+
+            width: childrenRect.width
+            height: bottomEdge.tipHeight
+            clip: true
+            y: -bottomEdge.tipHeight
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            UbuntuShape {
+                id: tip
+
+                width: tipLabel.paintedWidth + units.gu(6)
+                height: bottomEdge.tipHeight + units.gu(1)
+                color: Theme.palette.normal.overlay
+                Label {
+                    id: tipLabel
+
+                    anchors {
+                        top: parent.top
+                        left: parent.left
+                        right: parent.right
+                    }
+                    height: bottomEdge.tipHeight
+                    verticalAlignment: Text.AlignVCenter
+                    horizontalAlignment: Text.AlignHCenter
+                }
+            }
+        }
+
+        MouseArea {
+            preventStealing: true
+            drag.axis: Drag.YAxis
+            drag.target: bottomEdge
+            drag.minimumY: bottomEdge.pageStartY
+            drag.maximumY: page.height
+
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: bottomEdge.tipHeight
+            y: -height
+
+            onReleased: {
+                page.bottomEdgeReleased()
+                if (bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
+                    bottomEdge.state = "expanded"
+                } else {
+                    bottomEdge.state = "collapsed"
+                    bottomEdge.y = bottomEdge.height
+                }
+            }
+
+            onPressed: {
+                bottomEdge.state = "floating"
+                bottomEdge.y -= bottomEdge.tipHeight
+            }
+        }
+
+        Behavior on y {
+            UbuntuNumberAnimation {}
+        }
+
+        state: "collapsed"
+        states: [
+            State {
+                name: "collapsed"
+                PropertyChanges {
+                    target: bottomEdge
+                    y: bottomEdge.height
+                }
+                PropertyChanges {
+                    target: tip
+                    opacity: 1.0
+                }
+            },
+            State {
+                name: "expanded"
+                PropertyChanges {
+                    target: bottomEdge
+                    y: bottomEdge.pageStartY
+                }
+                PropertyChanges {
+                    target: tip
+                    opacity: 0.0
+                }
+            },
+            State {
+                name: "floating"
+                PropertyChanges {
+                    target: shadow
+                    opacity: 1.0
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                to: "expanded"
+                SequentialAnimation {
+                    UbuntuNumberAnimation {
+                        targets: [bottomEdge,tip]
+                        properties: "y,opacity"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                    ScriptAction {
+                        script: page._pushPage()
+                    }
+                }
+            },
+            Transition {
+                from: "expanded"
+                to: "collapsed"
+                SequentialAnimation {
+                    ScriptAction {
+                        script: {
+                            edgeLoader.item.parent = edgeLoader
+                            edgeLoader.item.anchors.fill = edgeLoader
+                            edgeLoader.item.active = false
+                        }
+                    }
+                    UbuntuNumberAnimation {
+                        targets: [bottomEdge,tip]
+                        properties: "y,opacity"
+                        duration: UbuntuAnimation.SlowDuration
+                    }
+                    ScriptAction {
+                        script: {
+                            // destroy current bottom page
+                            if (page.reloadBottomEdgePage) {
+                                edgeLoader.active = false
+                            }
+
+                            // notify
+                            page.bottomEdgeDismissed()
+
+                            // load a new bottom page in memory
+                            edgeLoader.active = true
+                        }
+                    }
+                }
+            },
+            Transition {
+                from: "floating"
+                to: "collapsed"
+                UbuntuNumberAnimation {
+                    targets: [bottomEdge,tip]
+                    properties: "y,opacity"
+                }
+            }
+        ]
+
+        Loader {
+            id: edgeLoader
+
+            z: 1
+            active: true
+            asynchronous: true
+            anchors.fill: parent
+
+            //WORKAROUND: The SDK move the page contents down to allocate space for the header we need to avoid that during the page dragging
+            Binding {
+                target: edgeLoader
+                property: "anchors.topMargin"
+                value: edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
+                when: (edgeLoader.status === Loader.Ready && !page.isReady)
+            }
+
+            onLoaded: {
+                if (page.isReady && edgeLoader.item.active != true) {
+                    page._pushPage()
+                }
+            }
+        }
+    }
+}

=== modified file 'src/imports/ContactView/ContactDetailAvatarView.qml'
--- src/imports/ContactView/ContactDetailAvatarView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactDetailAvatarView.qml	2014-06-06 17:32:09 +0000
@@ -44,7 +44,7 @@
     // update the contact detail in case of the contact change
     Connections {
         target: root.contact
-        onContactChanged: {            
+        onContactChanged: {
             if (root.contact) {
                 root.detail = contact.detail(ContactDetail.Avatar)
             } else {
@@ -53,7 +53,14 @@
         }
     }
 
-    onDetailChanged: updateAvatar.restart()
+    onDetailChanged: {
+        var newAvatar = root.getAvatar(root.detail)
+        if (newAvatar !== defaultAvatar) {
+            avatar.source = newAvatar
+        } else {
+            updateAvatar.restart()
+        }
+    }
 
     // Wait some milliseconds before update the avatar, in some cases the avatac get update later and this cause the image flick
     Timer {

=== modified file 'src/imports/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-05-20 14:56:42 +0000
+++ src/imports/ContactView/ContactDetailSyncTargetView.qml	2014-06-06 17:32:09 +0000
@@ -62,5 +62,8 @@
             value: Type.Group
             matchFlags: DetailFilter.MatchExactly
         }
+        autoUpdate: false
     }
+
+    Component.onCompleted: sourceModel.update()
 }

=== modified file 'src/imports/ContactView/ContactView.qml'
--- src/imports/ContactView/ContactView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/ContactView/ContactView.qml	2014-06-06 17:32:09 +0000
@@ -51,12 +51,21 @@
         }
     }
 
+    // Page page if the contact get removed
+    onContactChanged: {
+        if (!contact) {
+            pageStack.pop()
+        }
+    }
+
     Flickable {
         id: flickable
 
         flickableDirection: Flickable.VerticalFlick
         anchors.fill: parent
-        contentHeight: contents.height
+        //WORKAROUND: There is a bug on SDK page that causes the page to appear flicked with small contents
+        // see bug #1223050
+        contentHeight: Math.max(contents.height, parent.height)
         contentWidth: parent.width
         visible: !busyIndicator.visible
 
@@ -175,21 +184,8 @@
 
     tools: ToolbarItems {
         ToolbarButton {
-            objectName: "delete"
-
-            action: Action {
-                text: i18n.tr("Delete")
-                iconSource: "artwork:/delete.png"
-                onTriggered: {
-                    root.model.removeContact(root.contact.contactId)
-                    pageStack.pop()
-                }
-            }
-        }
-        ToolbarButton {
-            objectName: "edit"
-
-            action: Action {
+            action: Action {
+                objectName: "edit"
                 text: i18n.tr("Edit")
                 iconSource: "artwork:/edit.png"
                 onTriggered: {

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2014-05-28 19:56:00 +0000
+++ src/imports/MainWindow.qml	2014-06-06 17:32:09 +0000
@@ -27,11 +27,7 @@
     width: units.gu(40)
     height: units.gu(71)
     anchorToKeyboard: false
-
-    // workaround to change the application theme.
-    // Looks like SDK use this property to guess which theme to load.
-    // See bug #1277647
-    backgroundColor: "#221E1C"
+    useDeprecatedToolbar: false
 
     signal applicationReady()
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2014-05-28 19:56:00 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2014-06-06 17:32:09 +0000
@@ -1,4 +1,4 @@
-/*
+    /*
  * Copyright (C) 2012-2013 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
             left: parent.left
             right: parent.right
         }
-        color: UbuntuColors.coolGrey
+        color: Theme.palette.normal.overlay
 
         Row {
             anchors.fill: parent

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-05-28 19:56:00 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2014-06-06 17:32:09 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.2
 import QtContacts 5.0
+import Ubuntu.Contacts 0.1
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -285,9 +286,6 @@
         }
     }
 
-    acceptAction.text: i18n.dtr("address-book-app", "Delete")
-
-    listModel: contactsModel
     onCountChanged: {
         busyIndicator.ping()
         dirtyModel.restart()
@@ -493,8 +491,20 @@
     ContactFetch {
         id: contactFetch
 
-        model: contactListView.listModel
-        onContactFetched: contactListView.contactClicked(contact)
+        //WORKAROUND: Use a different model to fetch contacts, due a bug on qtpim the contact get
+        // destroyed if you change the filter model
+        ContactModel {
+            id: contactFetchModel
+
+            manager: root.manager
+            autoUpdate: false
+        }
+
+        model: root.manager == "memory" ? root.listModel : contactFetchModel
+        onContactFetched: {
+            console.debug("Contact fetched")
+            contactListView.contactClicked(contact)
+        }
     }
 
     // This is a workaround to make sure the spinner will disappear if the model is empty

=== modified file 'src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml'
--- src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2014-05-06 13:18:07 +0000
+++ src/imports/Ubuntu/Contacts/MultipleSelectionListView.qml	2014-06-06 17:32:09 +0000
@@ -71,25 +71,6 @@
     property bool multipleSelection: true
 
     /*!
-      \qmlproperty Action acceptAction
-
-      This property holds the action used into the accept button
-    */
-    property alias acceptAction: sheet.acceptAction
-    /*!
-      \qmlproperty Action acceptAction
-
-      This property holds the action used into the reject button
-    */
-    property alias rejectAction: sheet.rejectAction
-    /*!
-      \qmlproperty bool showActionButtons
-
-      This property holds if the default sheet element must be visible during the selection
-      By default this is set to true
-    */
-    property alias showActionButtons: sheet.enabled
-    /*!
       \qmlproperty model listModel
 
       This property holds the model providing data for the list.
@@ -191,42 +172,19 @@
             selectedItems.remove(0, selectedItems.count)
         }
     }
-
-    states: [
-        State {
-            name: "selection"
-            PropertyChanges {
-                target: sheet
-                active: true
-            }
-            PropertyChanges {
-                target: listView
-                bottomMargin: sheet.height
-            }
+    /*!
+      Select all items in the list
+    */
+    function selectAll()
+    {
+        if (multipleSelection) {
+            visualModel.items.addGroups(0, visualModel.items.count, ["selected"] )
         }
-    ]
+    }
 
     model: visualModel
 
     MultipleSelectionVisualModel {
         id: visualModel
     }
-
-    DialogButtons {
-        id: sheet
-
-        property bool active: false
-        property bool enabled: true
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: visible ? units.gu(6) : 0
-        visible: active && enabled
-
-        onReject: listView.cancelSelection()
-        onAccept: listView.endSelection()
-    }
 }

=== removed file 'src/imports/Ubuntu/Contacts/OrganicView.qml'
--- src/imports/Ubuntu/Contacts/OrganicView.qml	2013-07-22 23:49:56 +0000
+++ src/imports/Ubuntu/Contacts/OrganicView.qml	1970-01-01 00:00:00 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-Item {
-    id: organicList
-
-    readonly property alias count: listView.count
-    property alias model: listView.model
-    property Component delegate
-    property Component header
-
-    /// Size of the bigger thumbnails
-    property var bigSize: units.gu(19)
-    /// Size of the smaller thumbnails
-    property var smallSize: units.gu(12)
-    /// Space between the thumbnails
-    property alias margin: listView.spacing
-
-    QtObject {
-        id: priv
-
-        // readonly
-        readonly property int mediaPerPattern: 6
-
-        // internal, used to get the organix effect
-        /// X-position shift for the delegates in one of the organic blocks
-        readonly  property var photoX: [-margin, 0, 0, 0, 0, 0]
-        /// Y-position shift for the delegates in one of the organic blocks
-        readonly property var photoY: [smallSize + margin, 0, bigSize + margin, 0, bigSize + margin, 0]
-        /// Size of the delegate in one of the organic blocks
-        readonly property var photoSize: [bigSize, smallSize, smallSize, bigSize, smallSize, smallSize]
-        /// Size to be adapted for the organic effect
-        readonly property var photoWidth: [smallSize - margin, bigSize - (smallSize + margin), 2 * smallSize - bigSize, bigSize - (smallSize + margin), smallSize, 0]
-        /// Extra space on the right, for correct scroll boundary
-        readonly property var footerWidth: [smallSize,
-                                            bigSize - smallSize,
-                                            2 * smallSize - bigSize + margin,
-                                            bigSize - smallSize,
-                                            smallSize + margin,
-                                            0]
-        /// Used to generate a spacing between the events
-        readonly property real photosTopMargin: margin / 2
-    }
-
-    implicitHeight: bigSize + smallSize + priv.photosTopMargin + margin + margin/2
-    height: implicitHeight
-
-    ListView {
-        id: listView
-        objectName: "displaced"
-        // the buffers are needed, as the listview does not draw items outside is visible area
-        // but for the organic effect, x and width are "displaced" for some items (first, last)
-        property int leftBuffer: organicList.smallSize + organicList.margin
-        property int rightBuffer: organicList.smallSize
-
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
-            left: parent.left
-            leftMargin: -leftBuffer
-            right: parent.right
-            rightMargin: -rightBuffer
-        }
-
-        maximumFlickVelocity: units.gu(300)
-        flickDeceleration: maximumFlickVelocity / 3
-        cacheBuffer: 0
-        orientation: Qt.Horizontal
-        spacing: units.gu(2)
-
-        property int ccoun: children.length
-
-        delegate: Item {
-            id: itemDelegate
-
-            property int patternPhoto: index % priv.mediaPerPattern
-
-            width: priv.photoWidth[patternPhoto]
-            height: priv.photoSize[patternPhoto]
-
-            Loader {
-                id: delegateLoader
-
-                property var model: null
-                property int index: -1
-
-                x: priv.photoX[patternPhoto]
-                y: priv.photosTopMargin + priv.photoY[patternPhoto]
-
-                width: parent.height
-                height: parent.height
-                sourceComponent: organicList.delegate
-            }
-
-            Binding {
-                target: delegateLoader
-                property: "model"
-                value: model
-            }
-
-            Binding {
-                target: delegateLoader
-                property: "index"
-                value: index
-            }
-        }
-
-        header: Loader {
-            width: listView.leftBuffer + 2 * organicList.margin
-            height: organicList.smallSize
-
-            sourceComponent: organicList.header
-        }
-
-        footer: Item {
-            width: listView.rightBuffer + priv.footerWidth[listView.count % priv.mediaPerPattern] + listView.spacing
-        }
-    }
-}

=== added file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/__init__.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,150 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""address-book-app autopilot tests and emulators - top level package."""
+
+import logging
+
+
+logging.basicConfig(filename='warning.log', level=logging.WARNING)
+
+
+import autopilot.logging
+import ubuntuuitoolkit
+from autopilot.introspection import dbus
+
+from address_book_app import pages
+
+
+logger = logging.getLogger(__name__)
+
+
+class AddressBookApp(object):
+
+    def __init__(self, app_proxy):
+        super(AddressBookApp, self).__init__()
+        self.app_proxy = app_proxy
+        self.main_window = self.app_proxy.select_single(MainWindow)
+
+
+class MainWindow(ubuntuuitoolkit.MainView):
+    """An emulator class that makes it easy to interact with the app."""
+
+    def get_contact_list_page(self):
+        # ContactListPage is the only page that can appears multiple times
+        # Ex.: During the pick mode we alway push a new contactListPage, to
+        # preserve the current application status.
+        contact_list_pages = self.select_many(
+            pages.ContactListPage, objectName='contactListPage')
+
+        # alway return the page without pickMode
+        for p in contact_list_pages:
+            if not p.pickMode:
+                return p
+        return None
+
+    def get_contact_edit_page(self):
+        # We can have two contact editor page because of bottom edge page
+        # but we will return only the active one
+        list_page = self.get_contact_list_page()
+        list_page.bottomEdgePageLoaded.wait_for(True)
+        contact_editor_pages = self.select_many(
+            pages.ContactEditor, objectName="contactEditorPage")
+        for p in contact_editor_pages:
+            if p.active:
+                return p
+        raise dbus.StateNotFoundError('contactEditorPage not found')
+        return None
+
+
+    def get_contact_view_page(self):
+        return self.wait_select_single("ContactView",
+                                       objectName="contactViewPage")
+
+    def get_contact_list_pick_page(self):
+        pages = self.select_many("ContactListPage",
+                                 objectName="contactListPage")
+        for p in pages:
+            if p.pickMode:
+                return p
+        return None
+
+    def get_contact_list_view(self):
+        """
+        Returns a ContactListView iobject for the current window
+        """
+        return self.wait_select_single("ContactListView",
+                                       objectName="contactListView")
+
+    def get_button(self, buttonName):
+        return self.get_header()._get_action_button(buttonName)
+
+    def open_header(self):
+        header = self.get_header()
+        if (header.y != 0):
+            edit_page = self.get_contact_edit_page()
+            flickable = edit_page.wait_select_single(
+                "QQuickFlickable",
+                objectName="scrollArea")
+
+            while (header.y != 0):
+                globalRect = flickable.globalRect
+                start_x = globalRect.x + (globalRect.width * 0.5)
+                start_y = globalRect.y + (flickable.height * 0.1)
+                stop_y = start_y + (flickable.height * 0.1)
+
+                self.pointing_device.drag(
+                    start_x, start_y, start_x, stop_y, rate=5)
+                # wait flicking stops to move to the next field
+                flickable.flicking.wait_for(False)
+
+        return header
+
+    def cancel(self):
+        """
+        Press the 'Cancel' button
+        """
+        header = self.open_header()
+        header.click_custom_back_button()
+
+    def save(self):
+        """
+        Press the 'Save' button
+        """
+        bottom_swipe_page = self.get_contact_list_page()
+        self.click_action_button("save")
+        bottom_swipe_page.isCollapsed.wait_for(True)
+
+    def done_selection(self):
+        """
+        Press the 'doneSelection' button
+        """
+        bottom_swipe_page = self.get_contact_list_page()
+        self.click_action_button("doneSelection")
+        bottom_swipe_page.isCollapsed.wait_for(True)
+
+    def get_toolbar(self):
+        """Override base class so we get our expected Toolbar subclass."""
+        return self.select_single(ubuntuuitoolkit.Toolbar)
+
+    @autopilot.logging.log_action(logger.info)
+    def go_to_add_contact(self):
+        """
+        Press the 'Add' button and return the contact editor page
+        """
+        bottom_swipe_page = self.get_contact_list_page()
+        bottom_swipe_page.revel_bottom_edge_page()
+        return self.get_contact_edit_page()

=== removed file 'tests/autopilot/address_book_app/__init__.py'
--- tests/autopilot/address_book_app/__init__.py	2013-07-09 18:42:30 +0000
+++ tests/autopilot/address_book_app/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-"""address-book-app autopilot tests and emulators - top level package."""

=== added file 'tests/autopilot/address_book_app/_errors.py'
--- tests/autopilot/address_book_app/_errors.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/_errors.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,21 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import ubuntuuitoolkit
+
+
+class AddressBookAppError(ubuntuuitoolkit.ToolkitException):
+    """Exception raised when there is an error with the emulator."""

=== removed directory 'tests/autopilot/address_book_app/emulators'
=== removed file 'tests/autopilot/address_book_app/emulators/__init__.py'
--- tests/autopilot/address_book_app/emulators/__init__.py	2013-07-09 18:42:30 +0000
+++ tests/autopilot/address_book_app/emulators/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.

=== removed file 'tests/autopilot/address_book_app/emulators/main_window.py'
--- tests/autopilot/address_book_app/emulators/main_window.py	2014-05-12 19:44:47 +0000
+++ tests/autopilot/address_book_app/emulators/main_window.py	1970-01-01 00:00:00 +0000
@@ -1,342 +0,0 @@
-# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
-# Copyright 2013, 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
-import collections
-import logging
-import time
-
-from address_book_app.emulators.contact_list_page import ContactListPage
-from address_book_app.emulators.toolbar import Toolbar
-from autopilot import logging as autopilot_logging
-from ubuntuuitoolkit import emulators as uitk
-
-from address_book_app import data
-
-
-logger = logging.getLogger(__name__)
-
-
-_TEXT_FIELD_OBJECT_NAMES = {
-    'first_name': 'firstName',
-    'last_name': 'lastName',
-    'street': 'streetAddress_{}',
-    'locality': 'localityAddress_{}',
-    'region': 'regionAddress_{}',
-    'postal_code': 'postcodeAddress_{}',
-    'country': 'countryAddress_{}'
-}
-
-
-def _get_text_field(parent, field, index=None):
-    if field not in _TEXT_FIELD_OBJECT_NAMES:
-        raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    object_name = _TEXT_FIELD_OBJECT_NAMES[field]
-    if index is not None:
-        object_name = object_name.format(index)
-    return parent.select_single(TextInputDetail, objectName=object_name)
-
-
-class AddressBookAppError(uitk.ToolkitEmulatorException):
-    """Exception raised when there is an error with the emulator."""
-
-
-class MainWindow(uitk.MainView):
-    """An emulator class that makes it easy to interact with the app."""
-
-    def get_contact_list_page(self):
-        # ContactListPage is the only page that can appears multiple times
-        # Ex.: During the pick mode we alway push a new contactListPage, to
-        # preserve the current application status.
-        pages = self.select_many(ContactListPage,
-                                 objectName="contactListPage")
-
-        # alway return the page without pickMode
-        for p in pages:
-            if not p.pickMode:
-                return p
-        return None
-
-    def get_contact_edit_page(self):
-        return self.wait_select_single(ContactEditor,
-                                       objectName="contactEditorPage")
-
-    def get_contact_view_page(self):
-        return self.wait_select_single("ContactView",
-                                       objectName="contactViewPage")
-
-    def get_contact_list_pick_page(self):
-        pages = self.select_many("ContactListPage",
-                                 objectName="contactListPage")
-        for p in pages:
-            if p.pickMode:
-                return p
-        return None
-
-    def get_contact_list_view(self):
-        """
-        Returns a ContactListView iobject for the current window
-        """
-        return self.wait_select_single( "ContactListView",
-                                       objectName="contactListView")
-
-    def get_button(self, name):
-        """
-        Returns a Button object matching 'name'
-
-        Arguments:
-            name: Name of the button
-        """
-        return self.wait_select_single( "Button", objectName=name)
-
-    def cancel(self):
-        """
-        Press the 'Cancel' button
-        """
-        self.pointing_device.click_object(self.get_button("reject"))
-
-    def save(self):
-        """
-        Press the 'Save' button
-        """
-        self.pointing_device.click_object(self.get_button("accept"))
-
-    def get_toolbar(self):
-        """Override base class so we get our expected Toolbar subclass."""
-        return self.select_single(Toolbar)
-
-    @autopilot_logging.log_action(logger.info)
-    def go_to_add_contact(self):
-        """
-        Press the 'Add' button and return the contact editor page
-        """
-        toolbar = self.open_toolbar()
-        toolbar.click_button(object_name="Add")
-        return self.get_contact_edit_page()
-
-
-class ContactEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the Contact Editor."""
-
-    @autopilot_logging.log_action(logger.info)
-    def fill_form(self, contact_information):
-        """Fill the edit contact form.
-
-        :param contact_information: Values of the contact to fill the form.
-        :type contact_information: data object with the attributes first_name,
-            last_name, phones, emails, social_aliases, addresses and
-             professional_details
-
-        """
-        if contact_information.first_name is not None:
-            self._fill_first_name(contact_information.first_name)
-        if contact_information.last_name is not None:
-            self._fill_last_name(contact_information.last_name)
-
-        groups = collections.OrderedDict()
-        groups['phones'] = contact_information.phones
-        groups['emails'] = contact_information.emails
-        groups['ims'] = contact_information.social_aliases
-        groups['addresses'] = contact_information.addresses
-        groups['professionalDetails'] = (
-            contact_information.professional_details)
-
-        for key, information in groups.items():
-            if information:
-                self._fill_detail_group(
-                    object_name=key, details=information)
-
-    def _fill_first_name(self, first_name):
-        text_field = _get_text_field(self, 'first_name')
-        text_field.write(first_name)
-
-    def _fill_last_name(self, last_name):
-        text_field = _get_text_field(self, 'last_name')
-        text_field.write(last_name)
-
-    def _fill_detail_group(self, object_name, details):
-        editor = self.select_single(
-            ContactDetailGroupWithTypeEditor, objectName=object_name)
-        editor.fill(details)
-
-    def _get_form_values(self):
-        first_name = _get_text_field(self, 'first_name').text
-        last_name = _get_text_field(self, 'last_name').text
-        phones = self._get_values_from_detail_group(object_name='phones')
-        emails = self._get_values_from_detail_group(object_name='emails')
-        social_aliases = self._get_values_from_detail_group(object_name='ims')
-        addresses = self._get_values_from_detail_group(object_name='addresses')
-        professional_details = self._get_values_from_detail_group(
-            object_name='professionalDetails')
-
-        return data.Contact(
-            first_name=first_name, last_name=last_name, phones=phones,
-            emails=emails, social_aliases=social_aliases, addresses=addresses,
-            professional_details=professional_details)
-
-    def _get_values_from_detail_group(self, object_name):
-        editor = self.select_single(
-            ContactDetailGroupWithTypeEditor, objectName=object_name)
-        return editor.get_values(object_name)
-
-    def wait_to_stop_moving(self):
-        flickable = self.select_single(
-            'QQuickFlickable', objectName='scrollArea')
-        flickable.flicking.wait_for(False)
-
-
-class TextInputDetail(uitk.TextField):
-    """Custom proxy object for the Text Input Detail field."""
-
-
-class ContactDetailGroupWithTypeEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the ContactDetailGroupWithTypeEditor widget."""
-
-    _DETAIL_EDITORS = {
-        'phones': 'base_phoneNumber_{}',
-        'emails': 'base_email_{}',
-        'ims': 'base_onlineAccount_{}',
-        'addresses': 'base_address_{}',
-        # FIXME fix the unknown. --elopio - 2014-03-01
-        'professionalDetails': 'base_unknown_{}'
-    }
-
-    def fill(self, details):
-        """Fill a contact detail group."""
-        for index, detail in enumerate(details[:-1]):
-            self._fill_detail(index, detail)
-            self._add_detail()
-        self._fill_detail(len(details) - 1, details[-1])
-
-    def _fill_detail(self, index, detail):
-        detail_editor = self._get_detail_editor_by_index(index)
-        detail_editor.fill(field=self.objectName, index=index, detail=detail)
-
-    def _get_detail_editor_by_index(self, index):
-        object_name = self._get_contact_detail_editor_object_name(index)
-        return self.select_single(
-            ContactDetailWithTypeEditor, objectName=object_name)
-
-    def _get_contact_detail_editor_object_name(self, index):
-        return self._DETAIL_EDITORS[self.objectName].format(index)
-
-    def _add_detail(self):
-        # TODO --elopio - 2014-03-01
-        raise NotImplementedError('Add extra details not yet implemented.')
-
-    def get_values(self, object_name):
-        """Return the values of a contact detail group."""
-        values = []
-        for index in range(self.detailsCount):
-            detail_editor = self._get_detail_editor_by_index(index)
-            value = detail_editor.get_values(field=object_name, index=index)
-            if (value):
-                values.append(value)
-
-        return values
-
-
-class ContactDetailWithTypeEditor(uitk.UbuntuUIToolkitEmulatorBase):
-    """Custom proxy object for the ContactDetailWithTypeEditor widget."""
-
-    def __init__(self, *args):
-        super(ContactDetailWithTypeEditor, self).__init__(*args)
-        self.main_view = self.get_root_instance().select_single(MainWindow)
-
-    def fill(self, field, index, detail):
-        self._select_type(detail)
-        self._fill_value(field, index, detail)
-
-    def _select_type(self, detail):
-        type_index = detail.TYPES.index(detail.type)
-        selected_type_index = self._get_selected_type_index()
-        if type_index != selected_type_index:
-            # TODO --elopio - 2014-03-01
-            raise NotImplementedError('Type selection not yet implemented.')
-
-    def _get_selected_type_index(self):
-        value_selector = self.select_single('ValueSelector')
-        return value_selector.currentIndex
-
-    def _fill_value(self, field, index, detail):
-        single_values = {
-            'phones': 'number',
-            'emails': 'address',
-            'ims': 'alias'
-        }
-        if field in single_values:
-            self._fill_single_field(getattr(detail, single_values[field]))
-        elif field == 'addresses':
-            self._fill_address(index, detail)
-        elif field == 'professionalDetails':
-            self._fill_professional_details(index, detail)
-        else:
-            raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    def _fill_single_field(self, value):
-        text_field = self.select_single(TextInputDetail)
-        self._make_field_visible_and_write(text_field, value)
-
-    def _make_field_visible_and_write(self, text_field, value):
-        while not text_field.activeFocus:
-            # XXX We should just swipe the text field into view.
-            # Update this once bug http://pad.lv/1286479 is implemented.
-            # --elopio - 2014-03-01
-            text_field.keyboard.press_and_release('Tab')
-            time.sleep(0.1)
-            self.main_view.get_contact_edit_page().wait_to_stop_moving()
-
-        text_field.write(value)
-
-    def _fill_address(self, index, address):
-        fields = collections.OrderedDict()
-        fields['street'] = address.street
-        fields['locality'] = address.locality
-        fields['region'] = address.region
-        fields['postal_code'] = address.postal_code
-        fields['country'] = address.country
-        for key, value in fields.items():
-            text_field = _get_text_field(self, key, index)
-            self._make_field_visible_and_write(text_field, value)
-
-    def _fill_professional_details(self, index, address):
-        # TODO --elopio - 2014-03-01
-        raise NotImplementedError('Not yet implemented.')
-
-    def get_values(self, field, index):
-        if field == 'phones':
-            return data.Phone(
-                type_=data.Phone.TYPES[self._get_selected_type_index()],
-                number=self._get_single_field_value())
-        if field == 'emails':
-            return data.Email(
-                type_=data.Email.TYPES[self._get_selected_type_index()],
-                address=self._get_single_field_value())
-        if field == 'ims':
-            return data.SocialAlias(
-                type_=data.SocialAlias.TYPES[self._get_selected_type_index()],
-                alias=self._get_single_field_value())
-        if field == 'addresses':
-            return self._get_address_value(index)
-        if field == 'professionalDetails':
-            # TODO --elopio - 2014-03-01
-            return None
-        raise AddressBookAppError('Unknown field: {}.'.format(field))
-
-    def _get_single_field_value(self):
-        return self.select_single(TextInputDetail).text
-
-    def _get_address_value(self, index):
-        street = _get_text_field(self, 'street', index).text
-        locality = _get_text_field(self, 'locality', index).text
-        region = _get_text_field(self, 'region', index).text
-        postal_code = _get_text_field(self, 'postal_code', index).text
-        country = _get_text_field(self, 'country', index).text
-        return data.Address(
-            type_=data.Address.TYPES[self._get_selected_type_index()],
-            street=street, locality=locality, region=region,
-            postal_code=postal_code, country=country)

=== added directory 'tests/autopilot/address_book_app/pages'
=== added file 'tests/autopilot/address_book_app/pages/__init__.py'
--- tests/autopilot/address_book_app/pages/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/__init__.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,25 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+__all__ = [
+    'ContactEditor',
+    'ContactListPage',
+    'ContactView',
+]
+
+from address_book_app.pages._contact_editor import ContactEditor
+from address_book_app.pages._contact_list_page import ContactListPage
+from address_book_app.pages._contact_view import ContactView

=== added file 'tests/autopilot/address_book_app/pages/_common.py'
--- tests/autopilot/address_book_app/pages/_common.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_common.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,53 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+import ubuntuuitoolkit
+from autopilot.introspection import dbus
+
+
+logger = logging.getLogger(__name__)
+
+
+class PageWithHeader(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    def get_header(self):
+        """Return the Header custom proxy object of the Page."""
+        return self.get_root_instance().select_single(
+            'Header', objectName='MainView_Header')
+
+
+class PageWithBottomEdge(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """An emulator class that makes it easy to interact with the bottom edge
+       swipe page"""
+
+    def revel_bottom_edge_page(self):
+        """Bring the bottom edge page to the screen"""
+        self.bottomEdgePageLoaded.wait_for(True)
+        try:
+            action_item = self.wait_select_single(
+                'QQuickItem', objectName='bottomEdgeTip')
+            start_x = (action_item.globalRect.x +
+                       (action_item.globalRect.width * 0.5))
+            start_y = action_item.globalRect.y + (action_item.height * 0.5)
+            stop_y = start_y - (self.height * 0.7)
+            self.pointing_device.drag(
+                start_x, start_y, start_x, stop_y, rate=2)
+            self.isReady.wait_for(True)
+        except dbus.StateNotFoundError:
+            logger.error('ButtomEdge element not found.')
+            raise

=== added file 'tests/autopilot/address_book_app/pages/_contact_editor.py'
--- tests/autopilot/address_book_app/pages/_contact_editor.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_contact_editor.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,272 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import collections
+import logging
+import time
+
+import autopilot.logging
+import ubuntuuitoolkit
+from address_book_app import data, _errors
+from address_book_app.pages import _common
+
+
+logger = logging.getLogger(__name__)
+
+
+_TEXT_FIELD_OBJECT_NAMES = {
+    'first_name': 'firstName',
+    'last_name': 'lastName',
+    'street': 'streetAddress_{}',
+    'locality': 'localityAddress_{}',
+    'region': 'regionAddress_{}',
+    'postal_code': 'postcodeAddress_{}',
+    'country': 'countryAddress_{}'
+}
+
+
+def _get_text_field(parent, field, index=None):
+    if field not in _TEXT_FIELD_OBJECT_NAMES:
+        raise _errors.AddressBookAppError('Unknown field: {}.'.format(field))
+
+    object_name = _TEXT_FIELD_OBJECT_NAMES[field]
+    if index is not None:
+        object_name = object_name.format(index)
+    return parent.select_single(TextInputDetail, objectName=object_name)
+
+
+class ContactEditor(_common.PageWithHeader):
+    """Custom proxy object for the Contact Editor."""
+
+    @autopilot.logging.log_action(logger.info)
+    def fill_form(self, contact_information):
+        """Fill the edit contact form.
+
+        :param contact_information: Values of the contact to fill the form.
+        :type contact_information: data object with the attributes first_name,
+            last_name, phones, emails, social_aliases, addresses and
+             professional_details
+
+        """
+        if contact_information.first_name is not None:
+            self._fill_first_name(contact_information.first_name)
+        if contact_information.last_name is not None:
+            self._fill_last_name(contact_information.last_name)
+
+        groups = collections.OrderedDict()
+        groups['phones'] = contact_information.phones
+        groups['emails'] = contact_information.emails
+        groups['ims'] = contact_information.social_aliases
+        groups['addresses'] = contact_information.addresses
+        groups['professionalDetails'] = (
+            contact_information.professional_details)
+
+        for key, information in groups.items():
+            if information:
+                self._fill_detail_group(
+                    object_name=key, details=information)
+
+    def _fill_first_name(self, first_name):
+        text_field = _get_text_field(self, 'first_name')
+        text_field.write(first_name)
+
+    def _fill_last_name(self, last_name):
+        text_field = _get_text_field(self, 'last_name')
+        text_field.write(last_name)
+
+    def _fill_detail_group(self, object_name, details):
+        editor = self.select_single(
+            ContactDetailGroupWithTypeEditor, objectName=object_name)
+        editor.fill(details)
+
+    def _get_form_values(self):
+        first_name = _get_text_field(self, 'first_name').text
+        last_name = _get_text_field(self, 'last_name').text
+        phones = self._get_values_from_detail_group(object_name='phones')
+        emails = self._get_values_from_detail_group(object_name='emails')
+        social_aliases = self._get_values_from_detail_group(object_name='ims')
+        addresses = self._get_values_from_detail_group(object_name='addresses')
+        professional_details = self._get_values_from_detail_group(
+            object_name='professionalDetails')
+
+        return data.Contact(
+            first_name=first_name, last_name=last_name, phones=phones,
+            emails=emails, social_aliases=social_aliases, addresses=addresses,
+            professional_details=professional_details)
+
+    def _get_values_from_detail_group(self, object_name):
+        editor = self.select_single(
+            ContactDetailGroupWithTypeEditor, objectName=object_name)
+        return editor.get_values(object_name)
+
+    def wait_to_stop_moving(self):
+        flickable = self.select_single(
+            'QQuickFlickable', objectName='scrollArea')
+        flickable.flicking.wait_for(False)
+
+
+class TextInputDetail(ubuntuuitoolkit.TextField):
+    """Custom proxy object for the Text Input Detail field."""
+
+
+class ContactDetailGroupWithTypeEditor(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Custom proxy object for the ContactDetailGroupWithTypeEditor widget."""
+
+    _DETAIL_EDITORS = {
+        'phones': 'base_phoneNumber_{}',
+        'emails': 'base_email_{}',
+        'ims': 'base_onlineAccount_{}',
+        'addresses': 'base_address_{}',
+        # FIXME fix the unknown. --elopio - 2014-03-01
+        'professionalDetails': 'base_unknown_{}'
+    }
+
+    def fill(self, details):
+        """Fill a contact detail group."""
+        for index, detail in enumerate(details[:-1]):
+            self._fill_detail(index, detail)
+            self._add_detail()
+        self._fill_detail(len(details) - 1, details[-1])
+
+    def _fill_detail(self, index, detail):
+        detail_editor = self._get_detail_editor_by_index(index)
+        detail_editor.fill(field=self.objectName, index=index, detail=detail)
+
+    def _get_detail_editor_by_index(self, index):
+        object_name = self._get_contact_detail_editor_object_name(index)
+        return self.select_single(
+            ContactDetailWithTypeEditor, objectName=object_name)
+
+    def _get_contact_detail_editor_object_name(self, index):
+        return self._DETAIL_EDITORS[self.objectName].format(index)
+
+    def _add_detail(self):
+        # TODO --elopio - 2014-03-01
+        raise NotImplementedError('Add extra details not yet implemented.')
+
+    def get_values(self, object_name):
+        """Return the values of a contact detail group."""
+        values = []
+        for index in range(self.detailsCount):
+            detail_editor = self._get_detail_editor_by_index(index)
+            value = detail_editor.get_values(field=object_name, index=index)
+            if (value):
+                values.append(value)
+
+        return values
+
+
+class ContactDetailWithTypeEditor(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Custom proxy object for the ContactDetailWithTypeEditor widget."""
+
+    def fill(self, field, index, detail):
+        self._select_type(detail)
+        self._fill_value(field, index, detail)
+
+    def _select_type(self, detail):
+        type_index = detail.TYPES.index(detail.type)
+        selected_type_index = self._get_selected_type_index()
+        if type_index != selected_type_index:
+            # TODO --elopio - 2014-03-01
+            raise NotImplementedError('Type selection not yet implemented.')
+
+    def _get_selected_type_index(self):
+        value_selector = self.select_single('ValueSelector')
+        return value_selector.currentIndex
+
+    def _fill_value(self, field, index, detail):
+        single_values = {
+            'phones': 'number',
+            'emails': 'address',
+            'ims': 'alias'
+        }
+        if field in single_values:
+            self._fill_single_field(getattr(detail, single_values[field]))
+        elif field == 'addresses':
+            self._fill_address(index, detail)
+        elif field == 'professionalDetails':
+            self._fill_professional_details(index, detail)
+        else:
+            raise _errors.AddressBookAppError(
+                'Unknown field: {}.'.format(field))
+
+    def _fill_single_field(self, value):
+        text_field = self.select_single(TextInputDetail)
+        self._make_field_visible_and_write(text_field, value)
+
+    def _make_field_visible_and_write(self, text_field, value):
+        while not text_field.activeFocus:
+            # XXX We should just swipe the text field into view.
+            # Update this once bug http://pad.lv/1286479 is implemented.
+            # --elopio - 2014-03-01
+            text_field.keyboard.press_and_release('Tab')
+            time.sleep(0.1)
+            contact_editor = self.get_root_instance().select_single(
+                ContactEditor, objectName='contactEditorPage', active=True)
+            contact_editor.wait_to_stop_moving()
+
+        text_field.write(value)
+
+    def _fill_address(self, index, address):
+        fields = collections.OrderedDict()
+        fields['street'] = address.street
+        fields['locality'] = address.locality
+        fields['region'] = address.region
+        fields['postal_code'] = address.postal_code
+        fields['country'] = address.country
+        for key, value in fields.items():
+            text_field = _get_text_field(self, key, index)
+            self._make_field_visible_and_write(text_field, value)
+
+    def _fill_professional_details(self, index, address):
+        # TODO --elopio - 2014-03-01
+        raise NotImplementedError('Not yet implemented.')
+
+    def get_values(self, field, index):
+        if field == 'phones':
+            return data.Phone(
+                type_=data.Phone.TYPES[self._get_selected_type_index()],
+                number=self._get_single_field_value())
+        if field == 'emails':
+            return data.Email(
+                type_=data.Email.TYPES[self._get_selected_type_index()],
+                address=self._get_single_field_value())
+        if field == 'ims':
+            return data.SocialAlias(
+                type_=data.SocialAlias.TYPES[self._get_selected_type_index()],
+                alias=self._get_single_field_value())
+        if field == 'addresses':
+            return self._get_address_value(index)
+        if field == 'professionalDetails':
+            # TODO --elopio - 2014-03-01
+            return None
+        raise _errors.AddressBookAppError('Unknown field: {}.'.format(field))
+
+    def _get_single_field_value(self):
+        return self.select_single(TextInputDetail).text
+
+    def _get_address_value(self, index):
+        street = _get_text_field(self, 'street', index).text
+        locality = _get_text_field(self, 'locality', index).text
+        region = _get_text_field(self, 'region', index).text
+        postal_code = _get_text_field(self, 'postal_code', index).text
+        country = _get_text_field(self, 'country', index).text
+        return data.Address(
+            type_=data.Address.TYPES[self._get_selected_type_index()],
+            street=street, locality=locality, region=region,
+            postal_code=postal_code, country=country)

=== renamed file 'tests/autopilot/address_book_app/emulators/contact_list_page.py' => 'tests/autopilot/address_book_app/pages/_contact_list_page.py'
--- tests/autopilot/address_book_app/emulators/contact_list_page.py	2014-02-13 16:44:12 +0000
+++ tests/autopilot/address_book_app/pages/_contact_list_page.py	2014-06-06 17:32:09 +0000
@@ -1,23 +1,33 @@
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """ ContactListPage emulator for Addressbook App tests """
 
-# Copyright 2014 Canonical
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-
 import logging
+import time
 
 from autopilot.introspection.dbus import StateNotFoundError
-from ubuntuuitoolkit import emulators as uitk
+
+from address_book_app.pages import _common, _contact_view
+
 
 LOGGER = logging.getLogger(__name__)
-from time import sleep
-
-
-class ContactListPage(uitk.UbuntuUIToolkitEmulatorBase):
+
+
+class ContactListPage(_common.PageWithHeader, _common.PageWithBottomEdge):
     """ ContactListPage emulator class """
 
     def __init__(self, *args):
@@ -26,12 +36,28 @@
         self.selected_marks = []
         super(ContactListPage, self).__init__(*args)
 
+    def open_contact(self, index):
+        """Open the page with the contact information.
+
+        :param index: The index of the contact to open.
+        :return: The page with the contact information.
+
+        """
+        contacts = self.get_contacts()
+        self.pointing_device.click_object(contacts[index])
+        return self.get_root_instance().select_single(
+            _contact_view.ContactView, objectName='contactViewPage')
+
+    def _get_list_view(self):
+        return self.wait_select_single("ContactListView",
+                                       objectName="contactListView")
+
     def get_contacts(self):
         """
         Returns a list of ContactDelegate objects and populate
         self.selection_marks
         """
-        sleep(1)
+        time.sleep(1)
         self.contacts = self.select_many("ContactDelegate")
         self.selection_marks = []
         for contact in self.contacts:
@@ -41,17 +67,34 @@
             self.selection_marks.append(mark)
         return self.contacts
 
+    def start_selection(self, idx):
+        view = self._get_list_view()
+        if not view.isInSelectionMode:
+            self.get_contacts()
+            self.selected_marks.append(self.selection_marks[idx])
+            self.pointing_device.move_to_object(self.contacts[idx])
+            self.pointing_device.press()
+            time.sleep(2.0)
+            self.pointing_device.release()
+            view.isInSelectionMode.wait_for(True)
+        else:
+            self.selected_marks.append(self.selection_marks[idx])
+            self.pointing_device.click_object(self.selection_marks[idx])
+
+
     def select_contacts_by_index(self, indices):
         """ Select contacts corresponding to the list of index in indices
 
         :param indices: List of integers
         """
         self.deselect_all()
+        if len(indices) > 0:
+            self.start_selection(indices[0])
 
-        # Select matching indices
-        for idx in indices:
-            self.selected_marks.append(self.selection_marks[idx])
-            self.pointing_device.click_object(self.selection_marks[idx])
+            # Select matching indices
+            for idx in indices[1:]:
+                self.selected_marks.append(self.selection_marks[idx])
+                self.pointing_device.click_object(self.selection_marks[idx])
 
     def deselect_all(self):
         """Deselect every contacts"""
@@ -63,13 +106,17 @@
                                              objectName="selectionMark")
                 self.pointing_device.click_object(mark)
 
-    def click_button(self, objectname):
+    def click_button(self, parent, objectname):
         """Press a button that matches objectname
 
         :param objectname: Name of the object
         """
+        if parent:
+            obj = parent
+        else:
+            obj = self
         try:
-            buttons = self.select_many("Button",
+            buttons = obj.select_many("Button",
                                        objectName=objectname)
             for button in buttons:
                 if button.visible:
@@ -80,11 +127,8 @@
             )
             raise
 
-    def cancel(self):
-        """Press the cancel button displayed when pick mode is enabled"""
-        self.click_button("DialogButtons.rejectButton")
-
-    def delete(self):
-        """Press the delete button displayed when pick mode is enabled"""
-        self.click_button("DialogButtons.acceptButton")
-        self.get_contacts()
+    def delete(self, main_window):
+        main_window.done_selection()
+        dialog = main_window.wait_select_single("RemoveContactsDialog",
+            objectName="removeContactsDialog")
+        self.click_button(main_window, "removeContactsDialog.Yes")

=== added file 'tests/autopilot/address_book_app/pages/_contact_view.py'
--- tests/autopilot/address_book_app/pages/_contact_view.py	1970-01-01 00:00:00 +0000
+++ tests/autopilot/address_book_app/pages/_contact_view.py	2014-06-06 17:32:09 +0000
@@ -0,0 +1,28 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from address_book_app.pages import _common, _contact_editor
+
+
+class ContactView(_common.PageWithHeader):
+    """Autopilot helper for the ContactView page."""
+
+    def go_to_edit_contact(self):
+        self.get_header().click_action_button('edit')
+        return self.get_root_instance().select_single(
+            _contact_editor.ContactEditor,
+            objectName='contactEditorPage',
+            active=True)

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2014-04-29 21:05:10 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2014-06-06 17:32:09 +0000
@@ -16,7 +16,8 @@
 from autopilot.platform import model
 from testtools.matchers import Equals
 
-from address_book_app.emulators.main_window import MainWindow
+import address_book_app
+from address_book_app import MainWindow
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
 
@@ -45,6 +46,7 @@
             self.app_bin = AddressBookAppTestCase.DEFAULT_DEV_LOCATION
 
         os.environ['QTCONTACTS_MANAGER_OVERRIDE'] = 'memory'
+        os.environ['ADDRESS_BOOK_APP_ICON_THEME'] = 'ubuntu-mobile'
         vcard_data = ""
         if AddressBookAppTestCase.PRELOAD_VCARD:
             # Use vcard from source tree and fallback on installed vcard (from
@@ -70,6 +72,7 @@
         AddressBookAppTestCase.ARGS = []
         AddressBookAppTestCase.PRELOAD_VCARD = False
         self.main_window.visible.wait_for(True)
+        self.app = address_book_app.AddressBookApp(self.app_proxy)
 
     def tearDown(self):
         super(AddressBookAppTestCase, self).tearDown()
@@ -79,7 +82,7 @@
             subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
 
     def launch_test_local(self):
-        self.app = self.launch_test_application(
+        self.app_proxy = self.launch_test_application(
             self.app_bin,
             *AddressBookAppTestCase.ARGS,
             app_type='qt',
@@ -88,19 +91,19 @@
     def launch_test_installed(self):
         df = "/usr/share/applications/address-book-app.desktop"
         self.ARGS.append("--desktop_file_hint=" + df)
-        self.app = self.launch_test_application(
+        self.app_proxy = self.launch_test_application(
             "address-book-app",
             *AddressBookAppTestCase.ARGS,
             app_type='qt',
             emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
 
     def launch_click_installed(self):
-        self.app = self.launch_click_package(
+        self.app_proxy = self.launch_click_package(
             "com.ubuntu.address-book")
 
     @property
     def main_window(self):
-        return self.app.select_single(MainWindow)
+        return self.app_proxy.select_single(MainWindow)
 
     def select_a_value(self, field, value_selector, value):
         # Make sure the field has focus
@@ -159,7 +162,7 @@
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # Edit contact
-        self.main_window.open_toolbar().click_button("edit")
+        self.main_window.get_header().click_action_button("edit")
         self.assertThat(view_page.visible, Eventually(Equals(False)))
 
         edit_page = self.main_window.get_contact_edit_page()
@@ -223,7 +226,7 @@
                     postcode_address=None,
                     country_address=None):
         # execute add new contact
-        self.main_window.open_toolbar().click_button("Add")
+        self.main_window.go_to_add_contact()
 
         first_name_field = self.main_window.select_single(
             "TextInputDetail",
@@ -291,12 +294,4 @@
                 objectName="countryAddress_0")
             self.type_on_field(country_0, country_address)
 
-        edit_page = self.main_window.get_contact_edit_page()
-        accept_button = edit_page.select_single(
-            "Button",
-            objectName="accept")
-        self.pointing_device.click_object(accept_button)
-
-        # wait for contact list to be visible again
-        list_page = self.main_window.get_contact_list_page()
-        self.assertThat(list_page.visible, Eventually(Equals(True)))
+        self.main_window.save()

=== modified file 'tests/autopilot/address_book_app/tests/test_add_contact.py'
--- tests/autopilot/address_book_app/tests/test_add_contact.py	2014-05-16 20:34:08 +0000
+++ tests/autopilot/address_book_app/tests/test_add_contact.py	2014-06-06 17:32:09 +0000
@@ -11,9 +11,9 @@
 from autopilot.matchers import Eventually
 from autopilot.introspection import dbus
 
+import address_book_app
 from address_book_app import data
 from address_book_app.tests import AddressBookAppTestCase
-from address_book_app.emulators import main_window
 
 
 class TestAddContact(AddressBookAppTestCase):
@@ -22,37 +22,39 @@
     def test_go_to_add_contact(self):
         """Test to launch the add contact screen using emulator method"""
         self.assertRaises(
-            dbus.StateNotFoundError, self.main_window.get_contact_edit_page)
-        contact_editor = self.main_window.go_to_add_contact()
+            dbus.StateNotFoundError,
+            self.app.main_window.get_contact_edit_page)
+        contact_editor = self.app.main_window.go_to_add_contact()
         self.assertTrue(contact_editor.visible)
-        self.assertIsInstance(contact_editor, main_window.ContactEditor)
+        self.assertIsInstance(
+            contact_editor, address_book_app.pages.ContactEditor)
 
     def test_add_and_cancel_contact(self):
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # Check if the contact list disapear and contact editor appears
         self.assertThat(list_page.visible, Eventually(Equals(False)))
         self.assertThat(contact_editor.visible, Eventually(Equals(True)))
 
         # cancel new contact without save
-        self.main_window.cancel()
+        self.app.main_window.cancel()
 
         # Check if the contact list is visible again
         self.assertThat(list_page.visible, Eventually(Equals(True)))
 
         # Check if the contact list still empty
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
     def test_add_contact_without_name(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # Try to save a empty contact
-        acceptButton = self.main_window.get_button("accept")
+        acceptButton = self.app.main_window.get_button("save")
 
         # Save button must be disabled
         self.assertThat(acceptButton.enabled, Eventually(Equals(False)))
@@ -82,59 +84,59 @@
         self.pointing_device.click_object(acceptButton)
 
         # Check if the contact editor still visbile
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
 
         self.assertThat(list_page.visible, Eventually(Equals(False)))
         self.assertThat(contact_editor.visible, Eventually(Equals(True)))
 
         # Check if the contact list still empty
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(0)))
 
     def test_add_contact_with_full_name(self):
         test_contact = data.Contact(first_name='Fulano', last_name='de Tal')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if the contact list is visible again
-        list_page = self.main_window.get_contact_list_page()
+        list_page = self.app.main_window.get_contact_list_page()
         self.assertThat(list_page.visible, Eventually(Equals(True)))
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_first_name(self):
         test_contact = data.Contact(first_name='Fulano')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_last_name(self):
         test_contact = data.Contact(last_name='de Tal')
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_contact_with_name_and_phone(self):
@@ -143,14 +145,14 @@
             phones=[data.Phone.make()])
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_add_full_contact(self):
@@ -160,19 +162,19 @@
         test_contact.professional_details = []
 
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
         contact_editor.fill_form(test_contact)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # Check if contact was added
-        list_view = self.main_window.get_contact_list_view()
+        list_view = self.app.main_window.get_contact_list_view()
         self.assertThat(list_view.count, Eventually(Equals(1)))
 
     def test_email_label_save(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # fill name
         contact_editor.fill_form(
@@ -186,13 +188,13 @@
         self.set_email_address(2, "[e-mail]", 2)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
 
         # check if contacts was saved with the correct labels
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have 3 emails"""
@@ -222,7 +224,7 @@
 
     def test_phone_label_save(self):
         # execute add new contact
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         # fill name
         contact_editor.fill_form(
@@ -240,13 +242,13 @@
         self.set_phone_number(4, "[phone]", 4)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
 
         # check if contacts was saved with the correct labels
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have five phones"""

=== modified file 'tests/autopilot/address_book_app/tests/test_contactlist.py'
--- tests/autopilot/address_book_app/tests/test_contactlist.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_contactlist.py	2014-06-06 17:32:09 +0000
@@ -17,6 +17,6 @@
     """Tests the contact list features"""
 
     def test_contact_list(self):
-        contact_list = self.main_window.get_contact_list_page()
+        contact_list = self.app.main_window.get_contact_list_page()
         self.assertThat(contact_list.visible, Eventually(Equals(True)))
         pass

=== modified file 'tests/autopilot/address_book_app/tests/test_create_new_from_uri.py'
--- tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2014-03-24 22:42:05 +0000
+++ tests/autopilot/address_book_app/tests/test_create_new_from_uri.py	2014-06-06 17:32:09 +0000
@@ -23,14 +23,17 @@
         super(TestCreateNewContactFromURI, self).setUp()
 
     def test_save_new_contact(self):
-        edit_page = self.main_window.get_contact_edit_page()
+        list_page = self.app.main_window.get_contact_list_page()
+        list_page.isReady.wait_for(True)
+
+        edit_page = self.app.main_window.get_contact_edit_page()
         self.assertThat(edit_page.visible, Eventually(Equals(True)))
 
         # add name to the contact
-        firstNameField = self.main_window.wait_select_single(
+        firstNameField = self.app.main_window.wait_select_single(
             "TextInputDetail",
             objectName="firstName")
-        lastNameField = self.main_window.wait_select_single(
+        lastNameField = self.app.main_window.wait_select_single(
             "TextInputDetail",
             objectName="lastName")
 
@@ -38,15 +41,14 @@
         self.type_on_field(lastNameField, "de Tal")
 
         # save the contact
-        acceptButton = self.main_window.get_button("accept")
-        self.pointing_device.click_object(acceptButton)
+        self.app.main_window.save()
 
         # open contact view
-        contacts = self.main_window.select_many("ContactDelegate")
+        contacts = self.app.main_window.select_many("ContactDelegate")
         self.pointing_device.click_object(contacts[0])
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
-        
+
 
         # check if we have the new phone"""
         phone_group = view_page.select_single(

=== renamed file 'tests/autopilot/address_book_app/tests/test_emulators.py' => 'tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py'
--- tests/autopilot/address_book_app/tests/test_emulators.py	2014-03-01 11:03:45 +0000
+++ tests/autopilot/address_book_app/tests/test_custom_proxy_objects.py	2014-06-06 17:32:09 +0000
@@ -17,8 +17,6 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from address_book_app import data, tests
-from address_book_app.emulators import main_window
-
 
 class ContactEditorTestCase(tests.AddressBookAppTestCase):
 
@@ -29,7 +27,7 @@
         # --elopio - 2014-03-01
         test_contact.professional_details = []
 
-        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor = self.app.main_window.go_to_add_contact()
 
         contact_editor.fill_form(test_contact)
 

=== modified file 'tests/autopilot/address_book_app/tests/test_delete_contact.py'
--- tests/autopilot/address_book_app/tests/test_delete_contact.py	2014-03-13 01:40:39 +0000
+++ tests/autopilot/address_book_app/tests/test_delete_contact.py	2014-06-06 17:32:09 +0000
@@ -9,7 +9,6 @@
 # by the Free Software Foundation.
 
 from testtools.matchers import Equals
-
 from address_book_app.tests import AddressBookAppTestCase
 
 
@@ -25,9 +24,6 @@
         ("multiple_cancel", {
             "select": [1, 2],
             "action": "cancel"}),
-        ("none_delete", {
-            "select": [],
-            "action": "delete"}),
         ("single_delete", {
             "select": [1],
             "action": "delete"}),
@@ -49,16 +45,15 @@
         contact in the list before and after the action.
         Note that it doesn't check which contact has been deleted.
         """
-        self.main_window.open_toolbar().click_select()
-        listpage = self.main_window.get_contact_list_page()
+        listpage = self.app.main_window.get_contact_list_page()
         contacts_before = listpage.get_contacts()
 
         listpage.select_contacts_by_index(self.select)
         deleted = []
         if self.action == "cancel":
-            listpage.cancel()
+            self.app.main_window.cancel()
         elif self.action == "delete":
-            listpage.delete()
+            listpage.delete(self.app.main_window)
             deleted = self.select
 
         contacts_after = listpage.get_contacts()

=== modified file 'tests/autopilot/address_book_app/tests/test_edit_contact.py'
--- tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-05-16 20:34:08 +0000
+++ tests/autopilot/address_book_app/tests/test_edit_contact.py	2014-06-06 17:32:09 +0000
@@ -10,13 +10,28 @@
 from testtools.matchers import Equals
 from autopilot.matchers import Eventually
 
+from address_book_app import data
 from address_book_app.tests import AddressBookAppTestCase
 
 
 class TestEditContact(AddressBookAppTestCase):
     """Tests edit a contact"""
+
     PHONE_NUMBERS = ['[phone]', '[phone]', '[phone]']
 
+    def add_test_contact(self):
+        test_contact = data.Contact('test', 'test')
+        # TODO implement the filling of professional details.
+        # --elopio - 2014-03-01
+        test_contact.professional_details = []
+
+        # execute add new contact
+        contact_editor = self.main_window.go_to_add_contact()
+        contact_editor.fill_form(test_contact)
+
+        # Save contact
+        self.main_window.save()
+
     def test_add_new_phone(self):
         self.add_contact("Fulano", "de Tal", [self.PHONE_NUMBERS[0]])
         edit_page = self.edit_contact(0)
@@ -28,15 +43,15 @@
         self.create_new_detail(phoneGroup)
 
         # fill phone number
-        phone_number_1 = self.main_window.select_single(
+        phone_number_1 = self.app.main_window.select_single(
             "TextInputDetail",
             objectName="phoneNumber_1")
         self.type_on_field(phone_number_1, self.PHONE_NUMBERS[1])
 
-        self.main_window.save()
+        self.app.main_window.save()
 
         # go back to view page
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have two phones"""
@@ -56,16 +71,16 @@
         edit_page = self.edit_contact(0)
 
         # clear phone 1
-        phone_number_1 = self.main_window.select_single(
+        phone_number_1 = edit_page.select_single(
             "TextInputDetail",
             objectName="phoneNumber_1")
         self.clear_text_on_field(phone_number_1)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # check if we have onlye one phone
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         phone_group = view_page.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="phones")
@@ -87,15 +102,15 @@
         self.create_new_detail(emailGroup)
 
         # fill email address
-        email_field = self.main_window.select_single(
+        email_field = edit_page.select_single(
             "TextInputDetail",
             objectName="emailAddress_0")
         self.type_on_field(email_field, "[e-mail]")
 
-        self.main_window.save()
+        self.app.main_window.save()
 
         # go back to view page
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.visible, Eventually(Equals(True)))
 
         # check if we have a new email
@@ -113,19 +128,19 @@
 
     def test_remove_email(self):
         self.add_contact("Fulano", "de Tal", None, ["[e-mail]"])
-        self.edit_contact(0)
+        edit_page = self.edit_contact(0)
 
         # clear email
-        email_address_0 = self.main_window.select_single(
+        email_address_0 = edit_page.select_single(
             "TextInputDetail",
             objectName="emailAddress_0")
         self.clear_text_on_field(email_address_0)
 
         # Save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
         # check if the email list is empty
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         emails_group = view_page.select_single(
             "ContactDetailGroupWithTypeView",
             objectName="emails")
@@ -133,12 +148,12 @@
 
     def test_clear_names(self):
         self.add_contact("Fulano", "de Tal")
-        self.edit_contact(0)
+        edit_page = self.edit_contact(0)
 
-        first_name_field = self.main_window.select_single(
+        first_name_field = edit_page.select_single(
             "TextInputDetail",
             objectName="firstName")
-        last_name_field = self.main_window.select_single(
+        last_name_field = edit_page.select_single(
             "TextInputDetail",
             objectName="lastName")
 
@@ -147,14 +162,15 @@
         self.clear_text_on_field(last_name_field)
 
         # check if is possible to save a contact without name
-        accept_button = self.main_window.get_button("accept")
+        self.app.main_window.save()
+        accept_button = self.app.main_window.get_button("save")
         self.assertThat(accept_button.enabled, Eventually(Equals(False)))
 
         # Cancel edit
-        self.main_window.cancel()
+        self.app.main_window.cancel()
 
         # Check if the names still there
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
         self.assertThat(view_page.title, Eventually(Equals("Fulano de Tal")))
 
     def test_im_type(self):
@@ -162,13 +178,13 @@
         edit_page = self.edit_contact(0)
 
         # Change Im type
-        im_value_selector = self.main_window.select_single(
+        im_value_selector = edit_page.select_single(
             "ValueSelector",
             objectName="type_onlineAccount_0")
         self.pointing_device.click_object(im_value_selector)
         self.assertThat(im_value_selector.expanded, Eventually(Equals(True)))
 
-        im_address_0 = self.main_window.select_single(
+        im_address_0 = edit_page.select_single(
             "TextInputDetail",
             objectName="imUri_0")
 
@@ -176,9 +192,9 @@
         self.select_a_value(im_address_0, im_value_selector, 0)
 
         # save contact
-        self.main_window.save()
+        self.app.main_window.save()
 
-        view_page = self.main_window.get_contact_view_page()
+        view_page = self.app.main_window.get_contact_view_page()
 
         # check if the type was saved correct
         im_type = view_page.select_single(

=== modified file 'tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py'
--- tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_multiple_pick_mode.py	2014-06-06 17:32:09 +0000
@@ -22,7 +22,7 @@
         super(TestMultiplePickerMode, self).setUp()
 
     def test_select_contacts(self):
-        pick_page = self.main_window.get_contact_list_pick_page()
+        pick_page = self.app.main_window.get_contact_list_pick_page()
         contacts = pick_page.select_many("ContactDelegate")
         # all selection marks should be visible
         selection_marks = []

=== modified file 'tests/autopilot/address_book_app/tests/test_single_pick_mode.py'
--- tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2014-03-12 20:35:16 +0000
+++ tests/autopilot/address_book_app/tests/test_single_pick_mode.py	2014-06-06 17:32:09 +0000
@@ -22,7 +22,7 @@
         super(TestSinglePickerMode, self).setUp()
 
     def test_select_single_contact(self):
-        pick_page = self.main_window.get_contact_list_pick_page()
+        pick_page = self.app.main_window.get_contact_list_pick_page()
         contacts = pick_page.select_many("ContactDelegate")
         # all selection marks should be visible
         selection_marks = []

=== renamed file 'tests/autopilot/address_book_app/emulators/toolbar.py' => 'tests/autopilot/address_book_app/toolbar.py'