Merge lp:~renatofilho/address-book-app/fix-1213046 into lp:address-book-app

[Renato Araujo Oliveira Filho]

Ask for confirmation during the contact removal.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/266/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/267
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/267/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4823
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2676/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1001
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/698
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/698/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2678
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2678/artifact/work/output/*zip*/output.zip
    ABORTED: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2217/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2230

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/address-book-app-ci/266/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:95
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-amd64-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/269
        deb: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-armhf-ci/269/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-saucy-i386-ci/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/4831
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2690
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/1010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/706
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-amd64/706/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2692
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2692/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/2229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2241

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/address-book-app-ci/268/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

Looks good to me.

review: Approve

=== modified file 'src/imports/Ubuntu/Contacts/ContactDelegate.qml'
--- src/imports/Ubuntu/Contacts/ContactDelegate.qml	2013-10-07 18:41:15 +0000
+++ src/imports/Ubuntu/Contacts/ContactDelegate.qml	2013-10-09 13:09:34 +0000
@@ -54,7 +54,7 @@
                    contactListView.swipeToDelete &&
                    !detailsShown &&
                    !contactListView.isInSelectionMode
-
+        confirmRemoval: removable
         UbuntuShape {
             id: avatar
 
@@ -150,20 +150,6 @@
         onItemRemoved: {
             contactsModel.removeContact(contact.contactId)
         }
-
-        backgroundIndicator: Rectangle {
-            anchors.fill: parent
-            color: Theme.palette.selected.base
-            Label {
-                text: "Delete"
-                anchors {
-                    fill: parent
-                    margins: units.gu(2)
-                }
-                verticalAlignment: Text.AlignVCenter
-                horizontalAlignment:  delegate.swipingState === "SwipingLeft" ? Text.AlignLeft : Text.AlignRight
-            }
-        }
     }
 
     Loader {