Merge lp:~nik90/ubuntu-clock-app/change-x-icon into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Replace custom back icon X with the general "<" chevron back button as requested by design.

Replace custom back icon X with the general "<" chevron back button as requested by design.

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

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

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

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks great.
Thanks for MR.

review: Approve

[Mihir Soni (mihirsoni)]

lgtm !!

Thanks for MR.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-09-08 22:31:11 +0000
+++ app/alarm/EditAlarmPage.qml	2014-09-16 17:03:08 +0000
@@ -40,26 +40,17 @@
     title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
     visible: false
 
-    head {
-        backAction: Action {
-            iconName: "close"
-            onTriggered: {
-                mainStack.pop()
+    head.actions: Action {
+        id: saveAlarmButton
+        iconName: "ok"
+        objectName: "saveAlarmAction"
+        text: i18n.tr("Alarm")
+        onTriggered: {
+            if(isNewAlarm) {
+                saveNewAlarm()
             }
-        }
-
-        actions: Action {
-            id: saveAlarmButton
-            iconName: "ok"
-            objectName: "saveAlarmAction"
-            text: i18n.tr("Alarm")
-            onTriggered: {
-                if(isNewAlarm) {
-                    saveNewAlarm()
-                }
-                else {
-                    updateAlarm()
-                }
+            else {
+                updateAlarm()
             }
         }
     }