Merge lp:~renatofilho/address-book-app/new-bottom-edge into lp:address-book-app

[Renato Araujo Oliveira Filho]

Implement the new bottom edge using the SDK component.

[lp:~renatofilho/address-book-app/new-bottom-edge]

548. By Renato Araujo Oliveira Filho on 2015-12-04

Update BottomEdge editor page with the correct contact model.

549. By Renato Araujo Oliveira Filho on 2015-12-04

Removed support for deprecated application arguments.

550. By Renato Araujo Oliveira Filho on 2015-12-08

Make use of the new SDK PageHearder API.

551. By Renato Araujo Oliveira Filho on 2015-12-08

WORKAROUND: Set 'QuickUtils.mouseAttached = true' to avoid problems with bottom edge on desktop;

552. By Renato Araujo Oliveira Filho on 2015-12-08

Make sure that a contact is selected on application startup.

553. By Renato Araujo Oliveira Filho on 2015-12-09

Push contact view page component instead of object to avoid problems with page stack.

554. By Renato Araujo Oliveira Filho on 2015-12-09

Make bottom edge component on contact view available only when in dual column layout.

555. By Renato Araujo Oliveira Filho on 2015-12-14

Does not use navigationActions.

556. By Renato Araujo Oliveira Filho on 2015-12-14

Trunk merged.

557. By Renato Araujo Oliveira Filho on 2015-12-14

Fix problems with previous merge.

558. By Renato Araujo Oliveira Filho on 2015-12-14

Remove debug message.
Fix focus on contact list after close contact editor page.
Fix ambigous 'esc' short cut when editor page is opened.

559. By Renato Araujo Oliveira Filho on 2015-12-15

Create a empty state page for multi column layout.

560. By Renato Araujo Oliveira Filho on 2015-12-15

Move focus back to contaclist after close ContactEditor page.
Add 'esc' shortcut to close BottomEdge.

561. By Renato Araujo Oliveira Filho on 2015-12-17

Change bottom edge visual if a mouse is present.

562. By Renato Araujo Oliveira Filho on 2015-12-17

Update test to use new header API.

563. By Renato Araujo Oliveira Filho on 2015-12-17

Trunk merged.

564. By Renato Araujo Oliveira Filho on 2015-12-17

Create a leading actions property on Contact editor page to avoid problems with SDK replacing it.
Check if the mouse event is a real mouse event and not a touch event.

565. By Renato Araujo Oliveira Filho on 2015-12-17

Only enable keyboard visuals after pres 'down' key. To avoid enabling it while using the virtual keyboard.

566. By Renato Araujo Oliveira Filho on 2015-12-18

Sync load bottom edge page.

567. By Renato Araujo Oliveira Filho on 2015-12-18

Load BottomEdge component async to avoid delays on app startup.
Fix bottom edge contents size.

568. By Renato Araujo Oliveira Filho on 2015-12-18

Does not move contact list when vkb appears on bottom edge page.

569. By Renato Araujo Oliveira Filho on 2015-12-18

Trunk merged.

570. By Renato Araujo Oliveira Filho on 2015-12-19

Fixed 'back' action state while searching.

571. By Renato Araujo Oliveira Filho on 2015-12-19

Compile ContactEditorPage before push it on stack.

572. By Renato Araujo Oliveira Filho on 2015-12-20

Avoid stole contact list focus while creating bottom edge component.

573. By Renato Araujo Oliveira Filho on 2015-12-20

Disable edit button after first click on it. (avoid push the page more than once)

574. By Renato Araujo Oliveira Filho on 2016-01-04

highlight contact on click.

575. By Renato Araujo Oliveira Filho on 2016-01-04

Quick focus on contact name after open bottom edge page.

576. By Renato Araujo Oliveira Filho on 2016-01-04

Does not highlight settings item if not using keyboard.

577. By Renato Araujo Oliveira Filho on 2016-01-04

Update autopilot tests to work with the new bottom edge component.

578. By Renato Araujo Oliveira Filho on 2016-01-04

Removed debug message.

579. By Renato Araujo Oliveira Filho on 2016-01-04

Disable bottom edge while searching on multi colum layout.

580. By Renato Araujo Oliveira Filho on 2016-01-04

Cancel search after open bottom edge.

581. By Renato Araujo Oliveira Filho on 2016-01-04

Update contact view title on contact name change.

582. By Renato Araujo Oliveira Filho on 2016-01-04

Removed debug message.

583. By Renato Araujo Oliveira Filho on 2016-01-04

Fetch selected contact on application expansion.

584. By Renato Araujo Oliveira Filho on 2016-01-05

Use unity 8 private api to detect mouse and keyboard.

585. By Renato Araujo Oliveira Filho on 2016-01-05

Fetch first contact if no contact is selected after close bottom edge.

586. By Renato Araujo Oliveira Filho on 2016-01-05

Fixed field focus while adding new fields on contact editor.

587. By Renato Araujo Oliveira Filho on 2016-01-05

Disable bottom edge shortcut on contact list while it is not active.

588. By Renato Araujo Oliveira Filho on 2016-01-06

Update autopilot tests to work with the new bottom edge components.

589. By Renato Araujo Oliveira Filho on 2016-01-06

Update contact delegate click animation.

590. By Renato Araujo Oliveira Filho on 2016-01-06

Remove unused variables.

591. By Renato Araujo Oliveira Filho on 2016-01-06

Fixed focus on wrong field after add a new contact detail

592. By Renato Araujo Oliveira Filho on 2016-01-06

Focus contact list after close bottom edge.

593. By Renato Araujo Oliveira Filho on 2016-01-06

set minimum width and height for the app.

594. By Renato Araujo Oliveira Filho on 2016-01-07

Fixed focus on contact deletion.

595. By Renato Araujo Oliveira Filho on 2016-01-07

Fixed share component page to work with pagestack

596. By Renato Araujo Oliveira Filho on 2016-01-07

Reduce the application width necessary to change into multi column layout.

Unmerged revisions

=== modified file 'src/imports/ABContactEditorPage.qml'
--- src/imports/ABContactEditorPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/ABContactEditorPage.qml	2015-12-04 15:09:43 +0000
@@ -34,10 +34,10 @@
         name: "cancel"
 
         text: i18n.tr("Cancel")
-        iconName: "back"
-        onTriggered: {
-            root.cancel()
-        }
+        iconName: "down"
+        enabled: root.active && root.enabled
+        shortcut: "Esc"
+        onTriggered: root.cancel()
     }
 
     head.actions: [
@@ -46,9 +46,10 @@
             name: "save"
 
             text: i18n.tr("Save")
+            shortcut: "Ctrl+s"
             iconName: "ok"
             // disable save button while avatar scale still running
-            enabled: root.isContactValid
+            enabled: root.isContactValid && root.active
             onTriggered: root.save()
         }
     ]
@@ -58,4 +59,6 @@
             pageStack.contactListPage.moveListToContact(contact)
         }
     }
+
+    Component.onDestruction: console.debug("Destroy editor")
 }

=== modified file 'src/imports/ABContactListPage.qml'
--- src/imports/ABContactListPage.qml	2015-11-25 16:59:11 +0000
+++ src/imports/ABContactListPage.qml	2015-12-04 15:09:43 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,18 +30,19 @@
     id: mainPage
     objectName: "contactListPage"
 
+    property var viewPage: null
     property bool pickMode: false
     property alias contentHubTransfer: contactExporter.activeTransfer
     property bool pickMultipleContacts: false
     property QtObject contactIndex: null
     property string newPhoneToAdd: ""
     property alias contactManager: contactList.manager
-    property Page contactViewPage: null
-    property Page contactEditorPage: null
     property var _busyDialog: null
     property bool _importingTestData: false
+    property bool _creatingContact: false
 
-    readonly property bool bottomEdgePageOpened: bottomEdge.opened && bottomEdge.fullLoaded
+    readonly property string currentViewContactId: viewPage && viewPage.contact ? viewPage.contact.contactId : ""
+    readonly property bool bottomEdgePageOpened: false //bottomEdge.opened && bottomEdge.fullLoaded
     readonly property bool isEmpty: (contactList.count === 0)
     readonly property bool allowToQuit: (application.callbackApplication.length > 0)
     readonly property var contactModel: contactList.listModel ? contactList.listModel : null
@@ -61,30 +62,31 @@
     function createContactWithPhoneNumber(phoneNumber)
     {
         var newContact = ContactsJS.createEmptyContact(phoneNumber, mainPage);
-        openEditPage({model: contactList.listModel,
-                      contact: newContact,
-                      initialFocusSection: "name"},
-                     mainPage);
-    }
-
-    function openEditPage(editPageProperties, sourcePage) {
-        var component = Qt.createComponent(Qt.resolvedUrl("ABContactEditorPage.qml"))
-        if (component.status === Component.Ready) {
-            mainPage.contactEditorPage = component.createObject(mainPage, editPageProperties)
-            pageStack.addPageToNextColumn(sourcePage, mainPage.contactEditorPage)
-        }
+        pageStack.bottomEdge.editContact(newContact, mainPage.contactModel)
     }
 
     function openViewPage(viewPageProperties) {
+        if (mainPage.viewPage) {
+            pageStack.removePages(mainPage.viewPage)
+            mainPage.viewPage.destroy()
+            mainPage.viewPage = null
+        }
+
         var component = Qt.createComponent(Qt.resolvedUrl("ABContactViewPage.qml"))
         if (component.status === Component.Ready) {
-            mainPage.contactViewPage = component.createObject(mainPage, viewPageProperties)
-            pageStack.addPageToNextColumn(mainPage, mainPage.contactViewPage)
+            mainPage.viewPage = component.createObject(mainPage, viewPageProperties)
+            pageStack.addPageToNextColumn(mainPage, mainPage.viewPage)
         }
     }
 
     function showContact(contact)
     {
+        var currentContact = contactList.listModel.contacts[contactList.currentIndex]
+        if (currentContact && (mainPage.currentViewContactId === currentContact.contactId)) {
+            console.debug("Skip show contact")
+            return
+        }
+
         // go back to normal state if not searching
         if ((state !== "searching") &&
             (state !== "vcardImported")) {
@@ -136,14 +138,12 @@
 
     function moveListToContact(contact)
     {
-        // skipt it if searching or importing contacts
-        if ((state === "searching") ||
-            (state === "vcardImported")) {
-            return
+        if ((state !== "searching") &&
+            (state !== "vcardImported")) {
+            mainPage.state = "default"
         }
 
         contactIndex = contact
-        mainPage.state = "default"
         // this means a new contact was created
         if (mainPage.allowToQuit) {
             application.goBackToSourceApp()
@@ -157,42 +157,62 @@
         contactList.reset()
     }
 
-    function showContactEditorPage(editorPage) {
-        contactList.currentIndex = -1;
-        mainPage.contactEditorPage = editorPage;
-        pageStack.addPageToNextColumn(mainPage, editorPage);
-        editorPage.ready();
-        editorPage.contactSaved.connect(onNewContactSaved);
-    }
-
     function onNewContactSaved(contact) {
+        _creatingContact = true
+        moveListToContact(contact)
         if (pageStack.columns > 1) {
             showContact(contact);
         }
     }
 
+    function reloadContact()
+    {
+        fetchNewContactTimer.restart()
+        contactList.forceActiveFocus()
+    }
+
     title: i18n.tr("Contacts")
 
     flickable: null
+
+    Timer {
+        id: fetchNewContactTimer
+
+        interval: 0
+        repeat: false
+        onTriggered: {
+            if ((contactList.currentIndex >= 0) && (pageStack.columns > 1)) {
+                var currentContact = contactList.listModel.contacts[contactList.currentIndex]
+                if (mainPage.currentViewContactId === currentContact.contactId)
+                    return
+
+                contactList.view._fetchContact(contactList.currentIndex, currentContact)
+            }
+        }
+    }
+
     ContactsUI.ContactListView {
         id: contactList
         objectName: "contactListView"
+
+        focus: true
         showImportOptions:  !mainPage.pickMode &&
                             mainPage.newPhoneToAdd === "" &&
-                            (!mainPage.contactEditorPage || !mainPage.contactEditorPage.active)
+                            pageStack.bottomEdge && (pageStack.bottomEdge.satus === BottomEdge.Hidden)
         anchors {
             top: parent.top
             left: parent.left
             bottom: keyboard.top
             right: parent.right
         }
+        currentIndex: 0
         filterTerm: searchField.text
         multiSelectionEnabled: true
         multipleSelection: (mainPage.pickMode && mainPage.pickMultipleContacts) || !mainPage.pickMode
-        highlightSelected: pageStack.columns > 1
+        highlightSelected: pageStack.columns > 1 && !mainPage._creatingContact
+        showNewContact: (pageStack.columns > 1) && pageStack.bottomEdge && (pageStack.bottomEdge.status === BottomEdge.Committed)
         onAddContactClicked: mainPage.createContactWithPhoneNumber(label)
         onAddNewContactClicked: mainPage.createContactWithPhoneNumber(mainPage.newPhoneToAdd)
-
         onContactClicked: mainPage.showContact(contact)
         onIsInSelectionModeChanged: mainPage.state = isInSelectionMode ? "selection"  : "default"
         onSelectionCanceled: {
@@ -208,25 +228,71 @@
         }
 
         onError: pageStack.contactModelError(error)
+        onActiveFocusChanged: {
+            if (activeFocus && (contactList.currentIndex === -1)) {
+                contactList.currentIndex = 0
+            }
+        }
+        onCountChanged: {
+            if (mainPage.active &&
+                (pageStack.columns > 1) &&
+                (contactList.currentIndex === -1)) {
+                contactList.currentIndex = 0
+            }
+            fetchNewContactTimer.restart()
+        }
+        onCurrentIndexChanged: {
+            if (!mainPage.contactIndex)
+                fetchNewContactTimer.restart()
+        }
+
+        //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+        //because of that we need this
+        Keys.onRightPressed: {
+            // only move focus away when in edit mode
+            if (pageStack.bottomEdge.status === BottomEdge.Committed) {
+                var next = pageStack._nextItemInFocusChain(view, true)
+                if (next === searchField) {
+                    pageStack._nextItemInFocusChain(next, true)
+                }
+            }
+        }
+        Keys.onTabPressed: {
+            var next = pageStack._nextItemInFocusChain(view, true)
+            if (next === searchField) {
+                pageStack._nextItemInFocusChain(next, true)
+            }
+        }
     }
 
     TextField {
         id: searchField
 
+        //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+        //because of that we need this
+        readonly property bool _allowFocus: true
+
         anchors {
-            left: parent.left
-            right: parent.right
+            left: parent ? parent.left : undefined
+            right: parent ? parent.right : undefined
             rightMargin: units.gu(2)
         }
-        focus: false
+
         visible: false
-        onTextChanged: contactList.currentIndex = -1
         inputMethodHints: Qt.ImhNoPredictiveText
         placeholderText: i18n.tr("Search...")
-        onFocusChanged: {
-            if (visible && focus)
-                searchField.forceActiveFocus()
+        onVisibleChanged: {
+            if (visible) {
+                if (activeFocus) {
+                    Qt.inputMethod.show()
+                } else {
+                    searchField.forceActiveFocus()
+                }
+            }
         }
+
+        Keys.onTabPressed: contactList.forceActiveFocus()
+        Keys.onDownPressed: contactList.forceActiveFocus()
     }
 
     Connections {
@@ -265,6 +331,8 @@
                     text: i18n.tr("Search")
                     iconName: "search"
                     visible: !mainPage.isEmpty
+                    enabled: mainPage.state === "default"
+                    shortcut: "Ctrl+F"
                     onTriggered: {
                         mainPage.state = (mainPage.state === "newphone" ? "newphoneSearching" : "searching")
                         contactList.showAllContacts()
@@ -287,9 +355,21 @@
                 Action {
                     text: i18n.tr("Settings")
                     iconName: "settings"
-                    onTriggered: pageStack.addPageToNextColumn(mainPage,
-                                                               Qt.resolvedUrl("./Settings/SettingsPage.qml"),
-                                                               {"contactListModel": contactList.listModel})
+                    onTriggered:{
+                        var incubator = pageStack.addPageToNextColumn(mainPage,
+                                                                      Qt.resolvedUrl("./Settings/SettingsPage.qml"),
+                                                                     {"contactListModel": contactList.listModel})
+                        incubator.onStatusChanged = function(status) {
+                            if (status === Component.Ready) {
+                                incubator.object.onActiveChanged.connect(function(active) {
+                                    console.debug("Active:" + incubator.object.active)
+                                    if (!incubator.object.active) {
+                                        mainPage.reloadContact()
+                                    }
+                                })
+                            }
+                        }
+                    }
                 }
             ]
             PropertyChanges {
@@ -303,6 +383,10 @@
                 target: searchField
                 text: ""
             }
+            PropertyChanges {
+                target: bottomEdgeLoader
+                enabled: true
+            }
         },
         PageHeadState {
             id: searchingState
@@ -311,6 +395,8 @@
             backAction: Action {
                 iconName: "back"
                 text: i18n.tr("Cancel")
+                enabled: mainPage.state === "searching" && !mainPage.bottomEdgeOpenOnNextCollumn
+                shortcut:"Esc"
                 onTriggered: {
                     contactList.forceActiveFocus()
                     mainPage.head.sections.selectedIndex = 0
@@ -319,7 +405,7 @@
             }
 
             PropertyChanges {
-                target: bottomEdge
+                target: bottomEdgeLoader
                 enabled: false
             }
 
@@ -347,7 +433,9 @@
             backAction: Action {
                 text: i18n.tr("Cancel selection")
                 iconName: "back"
+                enabled: mainPage.state === "selection"
                 onTriggered: contactList.cancelSelection()
+                shortcut: "Esc"
             }
             actions: [
                 Action {
@@ -405,7 +493,7 @@
                 actions: selectionState.actions
             }
             PropertyChanges {
-                target: bottomEdge
+                target: bottomEdgeLoader
                 enabled: false
             }
         },
@@ -440,7 +528,7 @@
                 showAddNewButton: true
             }
             PropertyChanges {
-                target: bottomEdge
+                target: bottomEdgeLoader
                 enabled: false
             }
         },
@@ -462,7 +550,7 @@
                 backAction: vcardImportedState.backAction
             }
             PropertyChanges {
-                target: bottomEdge
+                target: bottomEdgeLoader
                 enabled: false
             }
             PropertyChanges {
@@ -493,8 +581,11 @@
         if (active && contactList.showAddNewButton) {
             contactList.positionViewAtBeginning()
         }
+
         if (active && (state === "searching")) {
             searchField.forceActiveFocus()
+        } else if (active) {
+            contactList.forceActiveFocus()
         }
     }
 
@@ -517,8 +608,8 @@
                   !contactList.favouritesIsSelected &&
                   mainPage.isEmpty &&
                   (mainPage.newPhoneToAdd === "") &&
-                  !(contactList.filterTerm && contactList.filterTerm !== "")) &&
-                  bottomEdge.visible
+                  !(contactList.filterTerm && contactList.filterTerm !== ""))
+                 //&&  bottomEdge.visible
 
         Behavior on visible {
             SequentialAnimation {
@@ -643,111 +734,34 @@
         }
     }
 
-    Component {
-        id: editorPageBottomEdge
-        ABContactEditorPage {
-            backIconName: "down"
-            implicitWidth: mainPage.width
-            implicitHeight: mainPage.height
-            model: contactList.listModel
-            contact: ContactsJS.createEmptyContact("", mainPage)
-            initialFocusSection: "name"
-            enabled: false
-        }
-    }
-
-    Component {
-        id: emptyContact
-        ContactsUI.ContactDelegate {
-            property Contact contact: Contact {
-                Name {
-                    firstName: i18n.tr("New contact")
-                }
-                Avatar {
-                    imageUrl: "image://theme/contact"
-                }
-            }
-            width: mainPage.width
-        }
-    }
-
-    BottomEdge {
-        id: bottomEdge
-        objectName: "bottomEdge"
-
-        property var incubator
-
-        // FIXME: this is a workaround for the lack of fully asynchronous loading
-        // of Pages in AdaptativePageLayout
-        function createObjectAsynchronously(url, properties, callback) {
-            var component = Qt.createComponent(url, Component.Asynchronous);
-            if (component.status == Component.Ready) {
-                incubateObject(component, properties, callback);
-            } else {
-                component.onStatusChanged.connect(function(status) {
-                    if (status == Component.Ready) {
-                        incubateObject(component, properties, callback);
-                    }
-                });
-            }
-        }
-
-        function incubateObject(component, properties, callback) {
-            if (component.status == Component.Ready) {
-                incubator = component.incubateObject(null,
-                                                     properties,
-                                                     Qt.Asynchronous);
-                incubator.onStatusChanged = function(status) {
-                    if (status == Component.Ready) {
-                        callback(incubator.object);
-                        incubator = null;
-                    }
-                }
-            }
-        }
-
-        function loadEditorPage() {
-            var newContact = ContactsJS.createEmptyContact("", mainPage);
-            createObjectAsynchronously(Qt.resolvedUrl("ABContactEditorPage.qml"),
-                                       {model: contactList.listModel,
-                                        contact: newContact,
-                                        initialFocusSection: "name"},
-                                       showContactEditorPage);
-        }
-
-        anchors.fill: parent
-        contentComponent: pageStack.columns == 1 ? editorPageBottomEdge : emptyContact
-        flickable: contactList
-        iconName: "contact-new"
-        enabled: !contactList.isInSelectionMode
-        backGroundEffectEnabled: pageStack.columns === 1
-
-        onOpenBegin: {
-            contactList.prepareNewContact = true;
-            contactList.positionViewAtBeginning();
-            if (pageStack.columns > 1) {
-                loadEditorPage();
-            }
-        }
-        onOpenEnd: {
-            bottomEdge.visible = false;
-            contactList.showNewContact = true;
-            if (pageStack.columns <= 1) {
-                showContactEditorPage(bottomEdge.content);
-            }
-        }
-
-        onClicked: {
-            bottomEdge.open();
-        }
+    Loader {
+        id: bottomEdgeLoader
+
+        enabled: false
+        active: (pageStack.columns === 1) && bottomEdgeLoader.enabled
+        sourceComponent: ABNewContactBottomEdge {
+            pageStack: mainPage.pageStack
+            parent: mainPage
+            hint.flickable: contactList.view
+        }
+    }
+
+    Binding {
+        target: pageStack
+        property: 'bottomEdge'
+        value: bottomEdgeLoader.item
+        when: bottomEdgeLoader.status == Loader.Ready
     }
 
     Connections {
         target: mainPage.contactModel
+
         onContactsChanged: {
             if (contactIndex) {
                 contactList.positionViewAtContact(mainPage.contactIndex)
                 mainPage.contactIndex = null
+                // at this point the operation has finished already
+                mainPage._creatingContact = false
             }
         }
         onImportCompleted: {
@@ -775,23 +789,4 @@
             }
         }
     }
-
-    Connections {
-        target: mainPage.contactViewPage
-        onEditContact: {
-            openEditPage(editPageProperties, mainPage.contactViewPage);
-        }
-    }
-
-    Connections {
-        target: mainPage.contactEditorPage
-        onActiveChanged: {
-            if (!mainPage.contactEditorPage.active) {
-                contactList.prepareNewContact = false;
-                contactList.showNewContact = false;
-                bottomEdge.visible = true;
-                bottomEdge.close();
-            }
-        }
-    }
 }

=== modified file 'src/imports/ABContactViewPage.qml'
--- src/imports/ABContactViewPage.qml	2015-10-28 01:08:39 +0000
+++ src/imports/ABContactViewPage.qml	2015-12-04 15:09:43 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2012-2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
     objectName: "contactViewPage"
 
     property string addPhoneToContact: ""
+    property var editorPage: null
     signal editContact(var editPageProperties)
 
     head.actions: [
@@ -50,9 +51,14 @@
 
             text: i18n.tr("Edit")
             iconName: "edit"
+            enabled: root.active
+            shortcut: "Ctrl+e"
             onTriggered: {
-                editContact({model: root.model,
-                             contact: root.contact});
+                pageStack.addPageToCurrentColumn(root,
+                                                 Qt.resolvedUrl("ABContactEditorPage.qml"),
+                                                 { model: root.model,
+                                                   contact: root.contact,
+                                                   backIconName: 'back'})
             }
         }
     ]
@@ -100,4 +106,26 @@
         id: contactShareComponent
         ContactSharePage {}
     }
+
+    Loader {
+        id: bottomEdgeLoader
+
+        active: root.pageStack &&  root.pageStack.columns > 1
+        sourceComponent: ABNewContactBottomEdge {
+            id: bottomEdge
+
+            parent: root
+            pageStack: root.pageStack
+            hint.flickable: root.flickable
+        }
+
+        Binding {
+            target: pageStack
+            property: 'bottomEdge'
+            value: bottomEdgeLoader.item
+            when: bottomEdgeLoader.status == Loader.Ready
+        }
+    }
+
+    Component.onDestruction:  console.debug("VIEW DESTROYED")
 }

=== added file 'src/imports/ABNewContactBottomEdge.qml'
--- src/imports/ABNewContactBottomEdge.qml	1970-01-01 00:00:00 +0000
+++ src/imports/ABNewContactBottomEdge.qml	2015-12-04 15:09:43 +0000
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2012-2015 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.4
+import Ubuntu.Components 1.3
+import Ubuntu.Contacts 0.1 as ContactsUI
+
+BottomEdge {
+    id: bottomEdge
+    objectName: "bottomEdge"
+
+    property var pageStack: null
+    property var _contactToEdit: null
+    property var _modelToEdit: null
+
+    function editContact(contact, model)
+    {
+        _contactToEdit = contact
+        _modelToEdit = model
+        commit()
+    }
+
+    hint {
+        action: Action {
+            iconName: "contact-new"
+            onTriggered: bottomEdge.commit()
+            shortcut: "ctrl+n"
+            enabled: bottomEdge.enabled
+        }
+    }
+    contentComponent: editorPageBottomEdge
+    onCommitCompleted: {
+        var editorPage = bottomEdge.contentItem
+        bottomEdge.pageStack.addPageToCurrentColumn(bottomEdge.parent, bottomEdge.contentItem)
+        editorPage.contact = bottomEdge._contactToEdit
+        editorPage.model = bottomEdge._modelToEdit
+        bottomEdge._contactToEdit = null
+        bottomEdge._modelToEdit = null
+    }
+
+    Component {
+        id: editorPageBottomEdge
+
+        ABContactEditorPage {
+            implicitWidth: mainPage.width
+            implicitHeight: bottomEdge.height
+            contact: ContactsUI.ContactsJS.createEmptyContact("", bottomEdge)
+            initialFocusSection: "name"
+            enabled: false
+            visible: bottomEdge.satus != BottomEdge.Hidden
+            onCanceled: bottomEdge.collapse()
+        }
+    }
+}

=== removed file 'src/imports/BottomEdge.qml'
--- src/imports/BottomEdge.qml	2015-11-19 01:02:12 +0000
+++ src/imports/BottomEdge.qml	1970-01-01 00:00:00 +0000
@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2015 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.4
-import Ubuntu.Components 1.3
-
-Item {
-    id: bottomEdge
-
-    readonly property alias content: bottomEdgeLoader.item
-    readonly property bool fullLoaded: bottomEdgeLoader.status == Loader.Ready
-
-    property bool opened: false
-    property Component contentComponent
-    property string iconName
-    property Item flickable
-    property alias backGroundEffectEnabled: darkBg.visible
-
-    signal openBegin
-    signal openEnd
-    signal clicked
-    visible: enabled
-
-    function open() {
-        bottomEdge.state = "expanded";
-    }
-
-    function close() {
-        bottomEdge.state = "collapsed";
-    }
-
-    Rectangle {
-        id: darkBg
-
-        anchors.fill: parent
-        color: "black"
-        opacity: 0.0
-    }
-
-    Item {
-        id: bottomEdgeBody
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: bottomEdgeContent.height
-
-        Item {
-            id: bottomEdgeContent
-            anchors {
-                left: parent.left
-                right: parent.right
-            }
-            height: bottomEdgeLoader.height
-
-            Item {
-                id: bottomEdgeShadows
-                anchors.fill: bottomEdgeContent
-
-                BottomEdgeShadow {
-                    anchors.bottom: parent.top
-                }
-
-                BottomEdgeShadow {
-                    anchors.top: parent.bottom
-                    rotation: 180
-                }
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                color: Theme.palette.normal.background
-            }
-
-            Loader {
-                id: bottomEdgeLoader
-                sourceComponent: bottomEdge.contentComponent
-                asynchronous: true
-                active: bottomEdge.enabled
-            }
-        }
-
-        BottomEdgeHint {
-            id: bottomEdgeHint
-
-            anchors.bottom: bottomEdgeBody.top
-            iconName: bottomEdge.iconName
-            onClicked: bottomEdge.clicked()
-
-            Connections {
-                target: bottomEdgeDragArea
-                onClosedChanged: {
-                    if (!bottomEdgeDragArea.closed) {
-                        bottomEdgeHint.state = "Visible";
-                    }
-                }
-            }
-
-            Connections {
-                target: flickable
-                onVerticalVelocityChanged: {
-                    if (!bottomEdgeDragArea.closed) {
-                        return;
-                    }
-
-                    if (flickable.verticalVelocity > 0) {
-                        bottomEdgeHint.state = "Hidden";
-                    } else if (flickable.verticalVelocity < 0) {
-                        bottomEdgeHint.state = "Visible";
-                    }
-                }
-            }
-        }
-    }
-
-
-    state: "collapsed"
-    states: [
-        State {
-            name: "collapsed"
-            ParentChange {
-                target: bottomEdgeContent
-                parent: bottomEdgeBody
-                x: 0
-                y: 0
-            }
-            PropertyChanges {
-                target: bottomEdgeBody
-                y: bottomEdgeDragArea.drag.maximumY
-            }
-            PropertyChanges {
-                target: bottomEdgeContent
-                opacity: 0.0
-            }
-            PropertyChanges {
-                target: darkBg
-                opacity: 0.0
-            }
-        },
-        State {
-            name: "expanded"
-            ParentChange {
-                target: bottomEdgeContent
-                parent: bottomEdge
-                x: 0
-                y: 0
-            }
-            PropertyChanges {
-                target: bottomEdgeContent
-                opacity: 1.0
-            }
-            PropertyChanges {
-                target: bottomEdgeBody
-                y: 0
-            }
-            PropertyChanges {
-                target: bottomEdgeShadows
-                opacity: 0.0
-                visible: true
-            }
-            PropertyChanges {
-                target: darkBg
-                opacity: 0.8
-            }
-        },
-        State {
-            name: "floating"
-            when: bottomEdgeDragArea.drag.active
-            PropertyChanges {
-                target: bottomEdgeContent
-                opacity: 1.0
-            }
-            PropertyChanges {
-                target: darkBg
-                opacity: bottomEdgeBody.y > 0 ? 0.8 - (bottomEdgeBody.y / bottomEdgeDragArea.drag.maximumY) : 0.8
-            }
-        }
-    ]
-
-    transitions: [
-        Transition {
-            to: "collapsed"
-            SequentialAnimation {
-                alwaysRunToEnd: true
-                ParallelAnimation {
-                    ParentAnimation {
-                        UbuntuNumberAnimation {
-                            properties: "x,y"
-                            duration: UbuntuAnimation.SlowDuration
-                            target: bottomEdgeContent
-                        }
-                    }
-                    UbuntuNumberAnimation {
-                        target: bottomEdgeBody
-                        property: "y"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                    UbuntuNumberAnimation {
-                        target: darkBg
-                        property: "opacity"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                }
-                PropertyAction {
-                    target: bottomEdgeContent
-                    property: "opacity"
-                }
-                ScriptAction {
-                    script: {
-                        bottomEdgeLoader.active = false
-                        bottomEdgeLoader.active = true
-                        bottomEdge.opened = false
-                    }
-                }
-            }
-        },
-        Transition {
-            to: "expanded"
-            SequentialAnimation {
-                alwaysRunToEnd: true
-                ParallelAnimation {
-                    ScriptAction {
-                        script: bottomEdge.openBegin()
-                    }
-                    ParentAnimation {
-                        UbuntuNumberAnimation {
-                            properties: "x,y"
-                            duration: UbuntuAnimation.SlowDuration
-                            target: bottomEdgeContent
-                        }
-                    }
-                    UbuntuNumberAnimation {
-                        target: bottomEdgeShadows
-                        property: "opacity"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                    UbuntuNumberAnimation {
-                        target: darkBg
-                        property: "opacity"
-                        duration: UbuntuAnimation.SlowDuration
-                    }
-                }
-                UbuntuNumberAnimation {
-                    target: bottomEdgeContent
-                    property: "opacity"
-                    duration: UbuntuAnimation.FastDuration
-                }
-                ScriptAction {
-                    script: {
-                        bottomEdge.opened = true
-                        bottomEdge.openEnd()
-                    }
-
-                }
-            }
-        }
-    ]
-
-    MouseArea {
-        id: bottomEdgeDragArea
-        objectName: "bottomEdgeDragArea"
-
-        property real previousY: -1
-        property string dragDirection: "None"
-        property bool closed: drag.target.y == bottomEdgeDragArea.drag.maximumY
-                            && !bottomEdgeDragArea.pressed
-
-        preventStealing: true
-        propagateComposedEvents: true
-        drag {
-            axis: Drag.YAxis
-            target: bottomEdgeBody
-            minimumY: 0
-            maximumY: bottomEdge.height
-        }
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: bottomEdgeHint.height
-
-        onPressed: {
-            previousY = mouse.y;
-        }
-
-        onReleased: {
-            if (dragDirection === "BottomToTop") {
-                bottomEdge.state = "expanded";
-            } else {
-                bottomEdge.state = "collapsed";
-            }
-            previousY = -1;
-            dragDirection = "None";
-        }
-
-        onMouseYChanged: {
-            var yOffset = previousY - mouseY;
-            // skip if was a small move
-            if (Math.abs(yOffset) <= units.gu(2)) {
-                return;
-            }
-            previousY = mouseY;
-            dragDirection = yOffset > 0 ? "BottomToTop" : "TopToBottom";
-        }
-    }
-}

=== removed file 'src/imports/BottomEdgeShadow.qml'
--- src/imports/BottomEdgeShadow.qml	2015-09-10 14:47:38 +0000
+++ src/imports/BottomEdgeShadow.qml	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2015 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.4
-import Ubuntu.Components 1.3
-
-Rectangle {
-    id: bottomEdgeShadow
-    anchors {
-        left: parent.left
-        right: parent.right
-    }
-    height: units.gu(1)
-    gradient: Gradient {
-        GradientStop { position: 0.0; color: Qt.rgba(0.0, 0.0, 0.0, 0.0) }
-        GradientStop { position: 1.0; color: Qt.rgba(0.0, 0.0, 0.0, 0.3) }
-    }
-}

=== modified file 'src/imports/CMakeLists.txt'
--- src/imports/CMakeLists.txt	2015-11-19 14:41:18 +0000
+++ src/imports/CMakeLists.txt	2015-12-04 15:09:43 +0000
@@ -4,10 +4,9 @@
     ABContactListPage.qml
     ABContactEditorPage.qml
     ABContactViewPage.qml
+    ABNewContactBottomEdge.qml
     ContentHubProxy.qml
     MainWindow.qml
-    BottomEdgeShadow.qml
-    BottomEdge.qml
 )
 
 install(FILES ${ADDRESS_BOOK_APP_QMLS}

=== modified file 'src/imports/MainWindow.qml'
--- src/imports/MainWindow.qml	2015-10-26 13:18:11 +0000
+++ src/imports/MainWindow.qml	2015-12-04 15:09:43 +0000
@@ -101,18 +101,41 @@
     width: units.gu(90)
     height: units.gu(71)
     anchorToKeyboard: false
+    focus: false
 
     AdaptivePageLayout {
         id: mainStack
 
-        primaryPage: contactPage
         property var contactListPage: null
+        property var bottomEdge: null
 
         function resetStack()
         {
             mainStack.removePages(primaryPage);
         }
 
+        function _nextItemInFocusChain(item, foward)
+        {
+            var next = item.nextItemInFocusChain(foward)
+            var first = next
+            //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+            //because of that we need this
+            while (!next || !next.hasOwnProperty("_allowFocus")) {
+                next = next.nextItemInFocusChain(foward)
+
+                // avoid loop
+                if (next === first) {
+                    next = null
+                    break
+                }
+            }
+            if (next) {
+                next.forceActiveFocus()
+            }
+            return next
+        }
+
+        primaryPage: contactPage
         onContactListPageChanged: {
             if (contentHubLoader.status === Loader.Ready) {
                 contentHubLoader.item.pageStack = mainStack
@@ -141,6 +164,7 @@
                 }
             }
         ]
+
     }
 
     ABContactListPage {
@@ -196,6 +220,10 @@
 
     // If application was called from uri handler and lost the focus reset the app to normal state
     onAppActiveChanged: {
+        if (appActive) {
+            mainStack.forceActiveFocus()
+        }
+
         if (!appActive && mainStack.contactListPage) {
             mainStack.contactListPage.returnToNormalState()
         }

=== modified file 'src/imports/Settings/SettingsPage.qml'
--- src/imports/Settings/SettingsPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Settings/SettingsPage.qml	2015-12-04 15:09:43 +0000
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (C) 2015 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,15 +64,56 @@
                 onCountChanged: numberFlickable.contentY = 0
             }
             ListItem.Standard {
+                id: addGoogleAccountItem
+
+                function activate()
+                {
+                    onlineAccountsHelper.setupExec()
+                }
+
                 text: i18n.tr("Add Google account")
                 progression: true
-                onClicked: onlineAccountsHelper.setupExec()
+
+                onClicked: addGoogleAccountItem.activate()
+                Keys.onRightPressed: addGoogleAccountItem.activate()
+                Keys.onDownPressed: {
+                    if (importFromSimItem.enabled) {
+                        importFromSimItem.forceActiveFocus()
+                    }
+                }
+
+                // selection visual feedback
+                __foregroundColor: (activeFocus && (pageStack.columns > 1)) ? "white" : Theme.palette.normal.foreground
+                Rectangle {
+                    color: UbuntuColors.orange
+                    anchors.fill: parent
+                    visible:addGoogleAccountItem.activeFocus
+                    z: -1
+                }
             }
             ListItem.Standard {
+                id: importFromSimItem
+
+                function activate()
+                {
+                    pageStack.addPageToCurrentColumn(root, simCardImportPageComponent)
+                }
+
                 text: i18n.tr("Import from SIM")
                 progression: true
-                onClicked: pageStack.addPageToCurrentColumn(root, simCardImportPageComponent)
                 enabled: (simList.sims.length > 0) && (simList.present.length > 0)
+                onClicked: importFromSimItem.activate()
+                Keys.onRightPressed: importFromSimItem.activate()
+                Keys.onUpPressed: addGoogleAccountItem.forceActiveFocus()
+
+                // selection visual feedback
+                __foregroundColor: (activeFocus && (pageStack.columns > 1)) ? "white" : Theme.palette.normal.foreground
+                Rectangle {
+                    color: UbuntuColors.orange
+                    anchors.fill: parent
+                    visible: importFromSimItem.activeFocus
+                    z: -1
+                }
             }
         }
     }
@@ -89,4 +130,14 @@
             sims: simList.sims
         }
     }
+
+    Keys.onDownPressed: addGoogleAccountItem.forceActiveFocus()
+    Keys.onRightPressed: addGoogleAccountItem.forceActiveFocus()
+    Keys.onLeftPressed: pageStack.removePages(root)
+    Keys.onEscapePressed: pageStack.removePages(root)
+    onActiveChanged: {
+        if (active) {
+            root.forceActiveFocus()
+        }
+    }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailBase.qml	2015-12-04 15:09:43 +0000
@@ -18,15 +18,19 @@
 import QtContacts 5.0 as QtContacts
 import Ubuntu.Components.ListItems 1.3 as ListItem
 
-ListItem.Empty {
+FocusScope {
     id: root
     objectName: detail ? "base_" + detailToString(detail.type, -1) + "_" + index : ""
 
+    property variant action: null
     property QtObject contact: null
     property QtObject detail: null
     property variant fields: null
     // help to test used to retrieve the correct element
     property int index: -1
+    property alias highlightOnFocus: highlight.visible
+
+    signal clicked()
 
     function detailToString(detail, field)
     {
@@ -98,13 +102,24 @@
         }
     }
 
-    highlightWhenPressed: false
-    showDivider: false
-
     Rectangle {
+        id: highlight
+
         anchors.fill: parent
         opacity: 0.1
-        visible: root.selected
+        visible: root.activeFocus
+        color: "black"
         z: 100
     }
+
+    MouseArea {
+        anchors.fill: parent
+
+        onClicked: {
+            if (action) {
+                action.triggered(action)
+            }
+            root.clicked()
+        }
+    }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml'
--- src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/Base/ContactDetailGroupBase.qml	2015-12-04 15:09:43 +0000
@@ -33,6 +33,7 @@
     property int minimumHeight: 0
     property bool loaded: false
     property bool showEmpty: true
+    property bool forceFocusOnFieldCreation: false
 
     signal newFieldAdded(var index)
 
@@ -146,7 +147,7 @@
                         newFields.push(detailItem.item)
                         root.newFieldAdded(detailItem.item)
                         root.inputFields = newFields
-                        if (root.loaded) {
+                        if (root.loaded && root.forceFocusOnFieldCreation) {
                             item.forceActiveFocus()
                         }
                     }

=== modified file 'src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml'
--- src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/Base/RemoveContactsDialog.qml	2015-12-04 15:09:43 +0000
@@ -53,6 +53,7 @@
     }
 
     Button {
+        id: acceptButton
         objectName: "removeContactsDialog.Yes"
         anchors {
             left: parent.left
@@ -61,10 +62,16 @@
         }
         text: i18n.dtr("address-book-app", "Yes")
         color: UbuntuColors.green
-        onClicked: accepted()
+        action: Action {
+            shortcut: "return"
+            onTriggered: {
+                accepted()
+            }
+        }
     }
 
     Button {
+        id: cancelButton
         objectName: "removeContactsDialog.No"
         anchors {
             left: parent.left
@@ -73,6 +80,16 @@
         }
         text: i18n.dtr("address-book-app", "No")
         color: UbuntuColors.red
-        onClicked: canceled()
+        action: Action {
+            shortcut: "esc"
+            onTriggered: {
+                canceled()
+            }
+        }
+    }
+
+    Component.onDestruction:  {
+        cancelButton.action.shortcut = ""
+        acceptButton.action.shortcut = ""
     }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-10-29 18:11:08 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailAvatarEditor.qml	2015-12-04 15:09:43 +0000
@@ -68,6 +68,7 @@
     detail: contact ? contact.detail(ContactDetail.Avatar) : null
     implicitHeight: units.gu(8)
     implicitWidth: units.gu(8)
+    highlightOnFocus: false
 
     UbuntuShape {
         id: avatar

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailGroupWithTypeEditor.qml	2015-12-04 15:09:43 +0000
@@ -98,29 +98,19 @@
         return changed
     }
 
-    headerDelegate: Empty {
+    forceFocusOnFieldCreation: true
+    headerDelegate: Label {
         id: header
-        highlightWhenPressed: false
-
-        width: root.width
-        height: units.gu(5)
-        // disable listview mouse area
-        __mouseArea.visible: false
-        divider.anchors.leftMargin: units.gu(2)
-        divider.anchors.rightMargin: units.gu(2)
-
-        Label {
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                right: parent.right
-                margins: units.gu(2)
-            }
-
-            text: root.title
-
-            // style
-            fontSize: "medium"
+
+        width: root.width - units.gu(4)
+        x: units.gu(2)
+        height: units.gu(4)
+        text: root.title
+        // style
+        fontSize: "medium"
+        verticalAlignment: Text.AlignVCenter
+        ThinDivider {
+            anchors.bottom: parent.bottom
         }
     }
 
@@ -157,7 +147,6 @@
         fields: root.fields
         height: implicitHeight
         width: root.width
-        selected: activeFocus
 
         inputMethodHints: root.inputMethodHints
         onDetailChanged: updateCombo(false)

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailNameEditor.qml	2015-12-04 15:09:43 +0000
@@ -55,6 +55,7 @@
     spacing: units.gu(1)
     detail: root.contact ? root.contact.name : null
     fields: [ Name.FirstName, Name.LastName ]
+    highlightOnFocus: false
 
     fieldDelegate: TextInputDetail {
         id: textInputDetail

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailSyncTargetEditor.qml	2015-12-04 15:09:43 +0000
@@ -87,7 +87,8 @@
     property real myHeight: sources.currentlyExpanded ? sources.containerHeight + units.gu(6) + label.height : sources.itemHeight + units.gu(6) + label.height
 
     detail: root.contact ? contact.detail(ContactDetail.SyncTarget) : null
-    implicitHeight: root.isNewContact &&  sources.model && (sources.model.count > 1) ? myHeight : 0
+    height: root.isNewContact &&  sources.model && (sources.model.count > 1) ? myHeight : 0
+    visible: height > 0
 
     ContactModel {
         id: sourceModel
@@ -144,8 +145,12 @@
     ThinDivider {
         id: divider
 
-        anchors.top: label.bottom
-    }
+        anchors {
+            top: label.bottom
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+        }
+   }
 
     OptionSelector {
         id: sources

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactDetailWithTypeEditor.qml	2015-12-04 15:09:43 +0000
@@ -70,7 +70,6 @@
     }
 
     // disable listview mouse area
-    __mouseArea.visible: false
     enabled: root.detail ? !root.detail.readOnly : false
     implicitHeight: detailTypeSelector.height + fieldValues.height + units.gu(2)
     opacity: enabled ? 1.0 : 0.5

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/ContactEditorPage.qml	2015-12-04 15:09:43 +0000
@@ -31,7 +31,6 @@
     property QtObject model: null
     property QtObject activeItem: null
 
-
     property string initialFocusSection: ""
     property var newDetails: []
 
@@ -39,9 +38,7 @@
     readonly property bool isContactValid: !avatarEditor.busy && (!nameEditor.isEmpty() || !phonesEditor.isEmpty())
 
     signal contactSaved(var contact);
-
-    // priv
-    property bool _edgeReady: false
+    signal canceled()
 
     function cancel() {
         for (var i = 0; i < contactEditor.newDetails.length; ++i) {
@@ -60,6 +57,7 @@
         } else {
             pageStack.pop()
         }
+        contactEditor.canceled()
     }
 
     function save() {
@@ -105,7 +103,7 @@
     }
 
     function makeMeVisible(item) {
-        if (!_edgeReady || !item) {
+        if (!enabled || !item) {
             return
         }
 
@@ -133,8 +131,6 @@
     function ready()
     {
         enabled = true
-        _edgeReady = true
-
         switch (contactEditor.initialFocusSection)
         {
         case "phones":
@@ -153,6 +149,7 @@
     }
 
     title: isNewContact ? i18n.dtr("address-book-app", "New contact") : i18n.dtr("address-book-app", "Edit")
+    enabled: false
 
     Timer {
         id: focusTimer
@@ -181,7 +178,9 @@
         contentWidth: parent.width
 
         //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)
+        onContentHeightChanged: {
+            contactEditor.makeMeVisible(contactEditor.activeItem)
+        }
 
         Column {
             id: contents
@@ -195,6 +194,7 @@
             height: childrenRect.height
 
             Row {
+                id: editEditor
                 function save()
                 {
                     var avatarSave = avatarEditor.save()
@@ -213,7 +213,7 @@
                     leftMargin: units.gu(2)
                     right: parent.right
                 }
-                height: Math.max(avatarEditor.height, nameEditor.height) - units.gu(4)
+                height: Math.max(avatarEditor.height, nameEditor.height) - units.gu(2)
 
                 ContactDetailAvatarEditor {
                     id: avatarEditor
@@ -221,6 +221,7 @@
                     contact: contactEditor.contact
                     height: implicitHeight
                     width: implicitWidth
+                    anchors.verticalCenter: editEditor.verticalCenter
                 }
 
                 ContactDetailNameEditor {
@@ -232,6 +233,7 @@
                 }
             }
 
+
             ContactDetailPhoneNumbersEditor {
                 id: phonesEditor
                 objectName: "phones"
@@ -301,8 +303,6 @@
                     left: parent.left
                     right: parent.right
                 }
-                height: implicitHeight
-
                 onChanged: {
                     if (contactEditor.enabled &&
                         !contactEditor.isNewContact &&
@@ -383,9 +383,13 @@
                     right: parent.right
                     margins: units.gu(2)
                 }
-                onClicked: {
-                    var dialog = PopupUtils.open(removeContactDialog, null)
-                    dialog.contacts = [contactEditor.contact]
+                action: Action {
+                    enabled: contactEditor.active && deleteButton.visible
+                    shortcut: "Ctrl+Delete"
+                    onTriggered: {
+                        var dialog = PopupUtils.open(removeContactDialog, null)
+                        dialog.contacts = [contactEditor.contact]
+                    }
                 }
             }
 
@@ -410,8 +414,8 @@
         }
     }
 
-    Component.onCompleted: {
-        if (!enabled) {
+    onActiveChanged: {
+        if (!active) {
             return
         }
 
@@ -475,10 +479,14 @@
             }
 
             // hide virtual keyboard if necessary
-            Component.onCompleted: Qt.inputMethod.hide()
+            Component.onCompleted: {
+                contactEditor.enabled = false
+                Qt.inputMethod.hide()
+            }
 
             // WORKAROUND: SDK element crash if pop the page where the dialog was created
             Component.onDestruction: {
+                contactEditor.enabled = true
                 if (popPages) {
                     if (contactEditor.pageStack.removePages) {
                         contactEditor.pageStack.removePages(contactEditor)

=== modified file 'src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml'
--- src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactEditor/TextInputDetail.qml	2015-12-04 15:09:43 +0000
@@ -25,7 +25,11 @@
 FocusScope {
     id: root
 
+    //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+    //because of that we need this
+    readonly property bool _allowFocus: true
     readonly property bool isTextField: true
+
     property QtObject detail
     property int field: -1
     property variant originalValue: root.detail && (root.field >= 0) ? root.detail.value(root.field) : null
@@ -67,6 +71,22 @@
     PhoneNumberField {
         id: field
 
+        //WORKAROUND: Due the SDK bug #1514822, #1514850 we can not disable focus for some items
+        //because of that we keep the focus only for textFields. This will block the user
+        //to use keyboard on "add-field" combo box and some other functionalities
+        function forceActiveFocusForNextField(keyEvent)
+        {
+            var backward = (keyEvent.modifiers & Qt.ShiftModifier)
+            var next = field.nextItemInFocusChain(!backward)
+            // only focus on TextInputDetails
+            while (!next || !next.hasOwnProperty("isTextField")) {
+                next = next.nextItemInFocusChain(!backward)
+            }
+            if (next) {
+                next.forceActiveFocus()
+            }
+        }
+
         anchors.fill: parent
         defaultRegion: PhoneUtils.defaultRegion
         autoFormat: false
@@ -93,15 +113,9 @@
             family: "Ubuntu"
             pixelSize: activeFocus ? FontUtils.sizeToPixels("large") : FontUtils.sizeToPixels("medium")
         }
-        Keys.onReturnPressed: {
-            var next = field.nextItemInFocusChain(true)
-            // only focus on TextInputDetails
-            while (!next || !next.hasOwnProperty("isTextField")) {
-                next = next.nextItemInFocusChain(true)
-            }
-            if (next) {
-                next.forceActiveFocus()
-            }
-        }
+
+        Keys.onReturnPressed: forceActiveFocusForNextField(event)
+        Keys.onTabPressed: forceActiveFocusForNextField(event)
+        Keys.onBacktabPressed: forceActiveFocusForNextField(event)
     }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ActionButton.qml	2015-12-04 15:09:43 +0000
@@ -30,5 +30,6 @@
         anchors.centerIn: parent
         height: root.iconSize
         width: root.iconSize
+        color: root.activeFocus ? UbuntuColors.orange : "gray"
     }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/BasicFieldView.qml	2015-12-04 15:09:43 +0000
@@ -27,6 +27,8 @@
     property variant fields: null
     property int parentIndex: -1
 
+    focus: false
+    activeFocusOnTab: false
     implicitHeight: typeLabel.height + fieldValues.height + units.gu(2)
 
     Column {

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-11-16 20:12:41 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailAvatarView.qml	2015-12-04 15:09:43 +0000
@@ -29,6 +29,8 @@
 
     implicitHeight: units.gu(12)
     implicitWidth: parent.width
+    activeFocusOnTab: false
+    focus: false
 
     Connections {
         id: connections

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailGroupWithTypeView.qml	2015-12-04 15:09:43 +0000
@@ -18,8 +18,7 @@
 import QtContacts 5.0 as QtContacts
 
 import Ubuntu.Components 1.3
-import Ubuntu.Components.ListItems 1.3 as ListItem
-
+import Ubuntu.Components.ListItems 1.3
 import Ubuntu.AddressBook.Base 0.1
 
 ContactDetailGroupWithTypeBase {
@@ -29,25 +28,18 @@
     signal actionTrigerred(string actionName, QtObject detail)
 
     showEmpty: false
-    headerDelegate: ListItem.Empty {
-        highlightWhenPressed: false
-
-        divider.anchors.leftMargin: units.gu(2)
-        divider.anchors.rightMargin: units.gu(2)
-        width: root.width
-        height: units.gu(5)
-        Label {
-            anchors {
-                verticalCenter: parent.verticalCenter
-                left: parent.left
-                right: parent.right
-                margins: units.gu(2)
-            }
-
-            text: root.title
-
-            // style
-            fontSize: "medium"
+    headerDelegate: Label {
+        id: header
+
+        width: root.width - units.gu(4)
+        x: units.gu(2)
+        height: units.gu(4)
+        text: root.title
+        // style
+        fontSize: "medium"
+        verticalAlignment: Text.AlignVCenter
+        ThinDivider {
+            anchors.bottom: parent.bottom
         }
     }
 

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailNameView.qml	2015-12-04 15:09:43 +0000
@@ -25,7 +25,8 @@
 
     detail: root.contact ? root.contact.name : null
     implicitHeight: label.paintedHeight + (label.anchors.margins * 2)
-
+    activeFocusOnTab: false
+    focus: false
 
     Label {
         id: label

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailSyncTargetView.qml	2015-12-04 15:09:43 +0000
@@ -50,6 +50,7 @@
     defaultIcon: "image://theme/contact-group"
     detailType: ContactDetail.SyncTarget
     typeModel: null
+    activeFocusOnTab: false
 
     fields: [ SyncTarget.SyncTarget ]
 
@@ -76,7 +77,7 @@
 
         height: implicitHeight
         width: root.width
-
+        activeFocusOnTab: false
         onClicked: root.actionTrigerred(root.defaultAction.name, detail)
 
         function overrideValue(detail, field)

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactDetailWithTypeView.qml	2015-12-04 15:09:43 +0000
@@ -43,6 +43,8 @@
         return detail.value(field)
     }
 
+    activeFocusOnTab: icon.visible
+    focus: false
     implicitHeight: view.implicitHeight
     onIsReadyChanged: populateValues()
 
@@ -78,5 +80,7 @@
         width: root.action && (root.action.iconName !== "") ? units.gu(2.5) : 0
         height: width
         name: root.action ? root.action.iconName : ""
+        color: root.activeFocus ? UbuntuColors.orange : "gray"
+        visible: width > 0
     }
 }

=== modified file 'src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml'
--- src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2015-11-16 15:44:43 +0000
+++ src/imports/Ubuntu/AddressBook/ContactView/ContactViewPage.qml	2015-12-04 15:09:43 +0000
@@ -41,6 +41,7 @@
         }
     }
 
+    focus: false
     title: contact ? ContactsJS.formatToDisplay(contact, i18n.dtr("address-book-app", "No name")) : ""
 
     Connections {

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2015-12-04 15:09:43 +0000
@@ -32,6 +32,7 @@
     signal clicked(int index, QtObject contact)
     signal pressAndHold(int index, QtObject contact)
 
+    focus: false
     implicitHeight: defaultHeight
     width: parent ? parent.width : 0
 

=== modified file 'src/imports/Ubuntu/Contacts/ContactListView.qml'
--- src/imports/Ubuntu/Contacts/ContactListView.qml	2015-11-16 22:12:29 +0000
+++ src/imports/Ubuntu/Contacts/ContactListView.qml	2015-12-04 15:09:43 +0000
@@ -42,7 +42,7 @@
         }
     \endqml
 */
-Item {
+FocusScope {
     id: root
 
     readonly property alias view: view
@@ -202,12 +202,6 @@
     */
     property bool showAddNewButton: false
     /*!
-      \qmlproperty bool prepareNewContact
-
-      This property holds if space for a draft new contact should be made available or not
-    */
-    property bool prepareNewContact: false
-    /*!
       \qmlproperty bool showNewContact
 
       This property holds if a draft new contact should be visible or not
@@ -253,6 +247,10 @@
 
     property var _busyDialog: null
 
+    //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+    //because of that we need this
+    property bool _allowFocus: true
+
     /*!
       This handler is called when the selection mode is finished without be canceled
     */
@@ -372,6 +370,8 @@
        buteoSync.startSyncByCategory("contacts")
     }
 
+    focus: true
+
     ContactSimpleListView {
         id: view
 
@@ -401,6 +401,7 @@
         }
         anchors.fill: parent
 
+
         // WORKAROUND: The SDK header causes the contactY to move to a wrong postion
         // calling the positionViewAtBeginning after the list created fix that
         Timer {
@@ -418,15 +419,18 @@
                 right: parent.right
             }
 
-            Connections {
-                target: root
-                onPrepareNewContactChanged: {
-                    if (root.prepareNewContact) {
-                        view.contentY = Qt.binding(function() {return -view.headerItem.height});
-                    } else {
-                        view.contentY = view.contentY;
-                    }
-                }
+            Binding {
+                target: view
+                property: 'contentY'
+                value: -view.headerItem.height
+                when: root.showNewContact
+            }
+
+            Binding {
+                target: view
+                property: 'currentIndex'
+                value: -1
+                when: root.showNewContact
             }
 
             // AddNewButton
@@ -455,10 +459,9 @@
                     }
                 }
                 selected: true
-                visible: root.prepareNewContact
-                height: root.prepareNewContact ? defaultHeight : 0
+                visible: root.showNewContact
+                height: root.showNewContact ? defaultHeight : 0
                 Behavior on height {UbuntuNumberAnimation {}}
-                opacity: root.showNewContact ? 1.0 : 0.0
             }
 
             Column {
@@ -624,4 +627,23 @@
                 !view.favouritesIsSelected &&
                 !isSearching ? sourceFile : ""
     }
+
+    Keys.onUpPressed: {
+        //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+        //because of that we need this
+        if (view.currentIndex == 0) {
+            pageStack._nextItemInFocusChain(view, false)
+        } else {
+            view.currentIndex -= 1
+        }
+    }
+    Keys.onDownPressed: {
+        //WORKAROUND: SDK does not allow us to disable focus for items due bug: #1514822
+        //because of that we need this
+        if (view.currentIndex == (view.count - 1)) {
+            //DO nothing
+        } else {
+            view.currentIndex += 1
+        }
+    }
 }

=== modified file 'src/imports/Ubuntu/Contacts/ContactSimpleListView.qml'
--- src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-11-16 22:12:29 +0000
+++ src/imports/Ubuntu/Contacts/ContactSimpleListView.qml	2015-12-04 15:09:43 +0000
@@ -204,7 +204,8 @@
     */
     function positionViewAtContact(contact)
     {
-        positionViewAtIndex(getIndex(contact), ListView.Center)
+        currentIndex = getIndex(contact)
+        positionViewAtIndex(currentIndex, ListView.Center)
     }
 
     /*!
@@ -213,7 +214,9 @@
     */
     function _fetchContact(index, contact)
     {
-        contactFetch.fetchContact(contact.contactId)
+        if (contact) {
+            contactFetch.fetchContact(contact.contactId)
+        }
     }
 
     function _updateSwipeState(item)
@@ -235,7 +238,6 @@
     }
 
     highlightFollowsCurrentItem: true
-    currentIndex: -1
     section {
         property: showSections ? "contact.tag.tag" : ""
         criteria: ViewSection.FirstCharacter
@@ -255,7 +257,6 @@
         dirtyModel.restart()
     }
 
-    onFlickStarted: view.currentIndex = -1
     listDelegate: ContactDelegate {
         id: contactDelegate
 
@@ -270,6 +271,7 @@
         width: parent.width
         selected: (contactListView.multiSelectionEnabled && contactListView.isSelected(contactDelegate))
                   || (contactListView.highlightSelected && (contactListView.currentIndex == index))
+        selectedColor: contactListView.parent.activeFocus && !contactListView.isInSelectionMode ? UbuntuColors.orange : "#E6E6E6"
         selectionMode: contactListView.isInSelectionMode
         defaultAvatarUrl: contactListView.defaultAvatarImageUrl
         isCurrentItem: ListView.isCurrentItem
@@ -371,13 +373,4 @@
         property int pendingTargetIndex: 0
         property variant pendingTargetMode: null
     }
-
-    Connections {
-        target: Qt.application
-        onActiveChanged: {
-            if (!Qt.application.active) {
-                currentIndex = -1
-            }
-        }
-    }
 }

=== modified file 'src/imports/Ubuntu/Contacts/FastScroll.qml'
--- src/imports/Ubuntu/Contacts/FastScroll.qml	2015-10-26 13:18:11 +0000
+++ src/imports/Ubuntu/Contacts/FastScroll.qml	2015-12-04 15:09:43 +0000
@@ -71,19 +71,11 @@
         }
     }
 
-    Connections {
-        target: listView
-        onCurrentIndexChanged: {
-            if (currentIndex != -1) {
-                rail.opacity = 0.0
-            }
-        }
-    }
 
     Rectangle {
         id: magnified
 
-        color: Theme.palette.normal.overlay
+        color: Theme.palette.normal.foreground
         radius: height * 0.3
         height: pinSize * 2
         width: height
@@ -99,6 +91,7 @@
         }
 
         Label {
+            color: "white"
             anchors.fill: parent
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
@@ -141,8 +134,7 @@
         id: rail
 
         property bool isVisible: root.enabled &&
-                                 (listView.flicking || dragArea.pressed) &&
-                                 (listView.currentIndex == -1)
+                                 (listView.flicking || dragArea.pressed)
         anchors {
             right: parent.right
             rightMargin: units.gu(2)