Merge lp:~nik90/ubuntu-clock-app/restore-back-multimode into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Restores the default back button in the alarm multiselect mode due to recent update by design.

Restores the default back button in the alarm multiselect mode due to recent update by design on bug 1370146.

Previously we used a custom back button in order to add a label below the back button icon. This is no longer needed. So this MP removes the custom back button and uses the SDK provided one.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:123
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/503/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/563
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/563/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/150

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/503/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

[Nekhelesh Ramananthan (nik90)]

Thanks for the review :)

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2014-09-25 20:10:43 +0000
+++ app/alarm/AlarmPage.qml	2014-09-26 12:26:59 +0000
@@ -54,28 +54,17 @@
             when: alarmListView.isInSelectionMode
 
             backAction: Action {
-                visible: false
+                iconName: "back"
+                text: i18n.tr("Back")
+                onTriggered: {
+                    alarmListView.cancelSelection()
+                }
             }
 
             contents: Item {
-                anchors.fill: parent ? parent : null
-                anchors.leftMargin: units.gu(-1)
-
-                HeaderButton {
-                    id: backButton
-
-                    anchors {
-                        left: parent.left
-                        verticalCenter: parent.verticalCenter
-                    }
-
-                    iconName: "back"
-                    text: i18n.tr("Back")
-
-                    onTriggered: {
-                        alarmListView.cancelSelection()
-                    }
-                }
+                anchors.right: parent ? parent.right: undefined
+                height: parent ? parent.height : undefined
+                width: childrenRect.width
 
                 HeaderButton {
                     id: selectButton
@@ -83,7 +72,6 @@
                     anchors {
                         right: deleteButton.left
                         rightMargin: units.gu(1)
-                        verticalCenter: parent.verticalCenter
                     }
 
                     text: {
@@ -114,10 +102,7 @@
                 HeaderButton {
                     id: deleteButton
 
-                    anchors {
-                        right: parent.right
-                        verticalCenter: parent.verticalCenter
-                    }
+                    anchors.right: parent.right
 
                     iconName: "delete"
                     text: i18n.tr("Delete")