Merge lp:~nik90/ubuntu-clock-app/new-bottom-edge into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

- Use the new bottom edge
- Updated copyright years of all files
- Updated debian changelog

Use the new bottom edge

The new SDK Bottom edge allows us to remove the PageWithBottomEdge custom component.

[lp:~nik90/ubuntu-clock-app/new-bottom-edge]

446. By Nekhelesh Ramananthan on 2016-02-25

Removed PageWithBottomEdge upstream component

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:446
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/57/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/618/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-bottom-edge]

447. By Nekhelesh Ramananthan on 2016-02-25

Updated copyright years

448. By Nekhelesh Ramananthan on 2016-02-25

Updated debian changelog

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:448
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/60/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/620/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/60/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-bottom-edge]

449. By Nekhelesh Ramananthan on 2016-02-25

Updated cmake file

450. By Nekhelesh Ramananthan on 2016-02-25

Make hint text translatable

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:449
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1066/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/622/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1066/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-bottom-edge]

451. By Nekhelesh Ramananthan on 2016-02-25

Show hint for two seconds at app startup

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:450
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1067/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/623/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1067/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:451
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1068/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/624/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1068/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nik90/ubuntu-clock-app/new-bottom-edge]

452. By Nekhelesh Ramananthan on 2016-02-25

Merged lp:ubuntu-clock-app

453. By Nekhelesh Ramananthan on 2016-02-25

Updated debian changelog

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:453
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1069/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/625/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/1069/rebuild

review: Needs Fixing (continuous-integration)

[Bartosz Kosiorek (gang65)]

It is working perfectly for me.
Thanks.

review: Approve

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'app/MainPage.qml'
--- app/MainPage.qml	2016-02-20 08:13:21 +0000
+++ app/MainPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -26,17 +26,17 @@
 import "stopwatch"
 import "components"
 
-PageWithBottomEdge {
+Page {
     id: _mainPage
     objectName: "mainPage"
 
-    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
+    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
     property string notLocalizedDateTimeString
 
     // String with localized time, eg.: "4:10 PM"
     property string localizedTimeString
 
-    // String with localized date, eg.: "Thursday, 17 September 2015"
+    // String with localized date, eg.: "Thursday, 17 September 2016"
     property string localizedDateString
 
     // Property to keep track of an app cold start status
@@ -49,9 +49,25 @@
     property var alarmModel
 
     flickable: null
-    bottomEdgeTitle: _mainPage.visible ? alarmUtils.set_bottom_edge_title(alarmModel, notLocalizedDateTimeString)
-                                       : i18n.tr("No active alarms")
-    bottomEdgePageComponent: AlarmPage {}
+
+    Timer {
+        id: hideBottomEdgeHintTimer
+        interval: 3000
+        onTriggered: bottomEdge.hint.status = BottomEdgeHint.Inactive
+    }
+
+    BottomEdge {
+        id: bottomEdge
+        height: parent.height
+        hint.iconName: "alarm-clock"
+        hint.text: i18n.tr("Alarms")
+        hint.status: BottomEdgeHint.Active
+        contentComponent: AlarmPage {
+            width: bottomEdge.width
+            height: bottomEdge.height
+        }
+        Component.onCompleted: hideBottomEdgeHintTimer.start()
+    }
 
     AlarmUtils {
         id: alarmUtils

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2016-02-16 15:51:20 +0000
+++ app/alarm/AlarmDelegate.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmLabel.qml'
--- app/alarm/AlarmLabel.qml	2015-10-22 16:49:23 +0000
+++ app/alarm/AlarmLabel.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2015-10-22 16:49:23 +0000
+++ app/alarm/AlarmList.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -31,7 +31,7 @@
     signal selectAll()
 
     clip: true
-    anchors.fill: parent
+    currentIndex: -1
 
     Timer {
         id: alarmTimer
@@ -71,7 +71,7 @@
             if (selectMode) {
                 selected = !selected
             } else {
-                pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
+                mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
             }
         }
 

=== modified file 'app/alarm/AlarmModelComponent.qml'
--- app/alarm/AlarmModelComponent.qml	2015-10-22 16:49:23 +0000
+++ app/alarm/AlarmModelComponent.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2015-10-22 16:49:23 +0000
+++ app/alarm/AlarmPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -24,102 +24,105 @@
 
     readonly property bool isAlarmPage: true
 
-    title: i18n.tr("Alarms")
     objectName: 'AlarmPage'
-    flickable: null
+    header: standardHeader
 
     Component.onCompleted: console.log("[LOG]: Alarm Page loaded")
 
-    states: [
-        PageHeadState {
-            name: "default"
-            head: alarmPage.head
-            when: !alarmListView.ViewItems.selectMode
-
-            backAction: Action {
-                iconName: "down"
-                text: i18n.tr("Back")
-                onTriggered: {
-                    pageStack.pop()
-                }
-            }
-
-            actions: [
-                Action {
-                    objectName: "addAlarmAction"
-                    iconName: "add"
-                    text: i18n.tr("Alarm")
-                    onTriggered: {
-                        pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
-                    }
-                }
-            ]
-        },
-
-        PageHeadState {
-            name: "selection"
-            head: alarmPage.head
-            when: alarmListView.ViewItems.selectMode
-
-            backAction: Action {
+    PageHeader {
+        id: standardHeader
+        title: i18n.tr("Alarms")
+        leadingActionBar.actions: [
+            Action {
+                text: "close"
+                iconName: "go-down"
+                onTriggered: {
+                    bottomEdge.collapse()
+                }
+            }
+        ]
+        trailingActionBar.actions: [
+            Action {
+                objectName: "addAlarmAction"
+                iconName: "add"
+                text: i18n.tr("Alarm")
+                onTriggered: {
+                    mainStack.push(Qt.resolvedUrl("EditAlarmPage.qml"))
+                }
+            }
+        ]
+    }
+
+    PageHeader {
+        id: selectionHeader
+        visible: alarmListView.ViewItems.selectMode
+        leadingActionBar.actions: [
+            Action {
                 iconName: "back"
                 text: i18n.tr("Back")
                 onTriggered: {
+                    alarmPage.header = standardHeader
                     alarmListView.ViewItems.selectMode = false
                 }
             }
-
-            actions: [
-                Action {
-                    text: {
-                        if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
-                            return i18n.tr("Select None")
-                        } else {
-                            return i18n.tr("Select All")
-                        }
-                    }
-
-                    iconSource: {
-                        if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
-                            return Qt.resolvedUrl("../graphics/select-none.svg")
-                        } else {
-                            return Qt.resolvedUrl("../graphics/select.svg")
-                        }
-                    }
-
-                    onTriggered: {
-                        if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
-                            alarmListView.clearSelection()
-                        } else {
-                            alarmListView.selectAll()
-                        }
-                    }
-                },
-
-                Action {
-                    iconName: "delete"
-                    text: i18n.tr("Delete")
-                    enabled: alarmListView.ViewItems.selectedIndices.length !== 0
-
-                    onTriggered: {
-                        var items = alarmListView.ViewItems.selectedIndices
-
-                        for(var i=0; i < alarmListView.ViewItems.selectedIndices.length; i++) {
-                            var alarm = alarmModel.get(alarmListView.ViewItems.selectedIndices[i])
-                            alarm.cancel()
-                        }
-
-                        alarmListView.closeSelection()
-                    }
-                }
-            ]
-        }
-    ]
+        ]
+
+        trailingActionBar.actions: [
+            Action {
+                text: {
+                    if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
+                        return i18n.tr("Select None")
+                    } else {
+                        return i18n.tr("Select All")
+                    }
+                }
+
+                iconSource: {
+                    if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
+                        return Qt.resolvedUrl("../graphics/select-none.svg")
+                    } else {
+                        return Qt.resolvedUrl("../graphics/select.svg")
+                    }
+                }
+
+                onTriggered: {
+                    if(alarmListView.ViewItems.selectedIndices.length === alarmListView.count) {
+                        alarmListView.clearSelection()
+                    } else {
+                        alarmListView.selectAll()
+                    }
+                }
+            },
+
+            Action {
+                iconName: "delete"
+                text: i18n.tr("Delete")
+                enabled: alarmListView.ViewItems.selectedIndices.length !== 0
+
+                onTriggered: {
+                    var items = alarmListView.ViewItems.selectedIndices
+
+                    for(var i=0; i < alarmListView.ViewItems.selectedIndices.length; i++) {
+                        var alarm = alarmModel.get(alarmListView.ViewItems.selectedIndices[i])
+                        alarm.cancel()
+                    }
+
+                    alarmListView.closeSelection()
+                }
+            }
+        ]
+    }
 
     AlarmList {
         id: alarmListView
         model: alarmModel
-        anchors.fill: parent
+        anchors {
+            top: alarmPage.header.bottom
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
         localTime: {
             return new Date
                 (
@@ -137,7 +140,7 @@
     Loader {
         id: emptyStateLoader
         anchors {
-            top: parent.top
+            top: alarmPage.header.bottom
             topMargin: units.gu(5)
             left: parent.left
             right: parent.right

=== modified file 'app/alarm/AlarmRepeat.qml'
--- app/alarm/AlarmRepeat.qml	2016-02-15 21:09:17 +0000
+++ app/alarm/AlarmRepeat.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2016-02-15 20:02:54 +0000
+++ app/alarm/AlarmSettingsPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/alarm/AlarmUtils.qml'
--- app/alarm/AlarmUtils.qml	2015-12-11 02:13:16 +0000
+++ app/alarm/AlarmUtils.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -50,39 +50,6 @@
         }
     }
 
-    // Function to set the bottom edge title with "Next Active in..."
-    function set_bottom_edge_title(alarmModel, clockTimeString) {
-        var bottom_edge_title = i18n.tr("No active alarms")
-
-        var clockTime = new Date
-                (
-                    clockTimeString.split(":")[0],
-                    clockTimeString.split(":")[1] - 1,
-                    clockTimeString.split(":")[2],                    
-                    clockTimeString.split(":")[3],
-                    clockTimeString.split(":")[4],
-                    clockTimeString.split(":")[5],
-                    0
-                    )
-        /*
-         Check if alarm model received is valid and has saved alarms and only
-         then proceed to find the next active alarm.
-        */
-        if (!alarmModel || !alarmModel.count) {
-            return bottom_edge_title
-        }
-
-        var activeAlarmDate = _get_next_active_alarm(alarmModel, clockTime)
-
-        // Return immediately if there are no active alarms found
-        if (!activeAlarmDate)  {
-          return bottom_edge_title
-        }
-
-        bottom_edge_title = i18n.tr("Next Alarm %1").arg(get_time_to_alarm(activeAlarmDate, clockTime))
-        return bottom_edge_title
-    }
-
     function get_utc_time(dateTime) {
         return new Date(dateTime.getUTCFullYear(),
                         dateTime.getUTCMonth(),
@@ -153,27 +120,6 @@
       INTERNAL FUNCTIONS
     */
 
-    /*
-     Function to get the next active alarm. This function ignores alarms in the
-     past and also iteratively looks through every alarm since the alarm model
-     does not always list the active alarms in chronological order.
-    */
-    function _get_next_active_alarm(alarmModel, clockTime) {
-        var activeAlarmDate = undefined
-
-        for (var i=0; i<alarmModel.count; i++) {
-            var currentAlarm = alarmModel.get(i)
-            if (currentAlarm.enabled && currentAlarm.date > clockTime) {
-                if (activeAlarmDate === undefined ||
-                        currentAlarm.date < activeAlarmDate) {
-                    activeAlarmDate = currentAlarm.date
-                }
-            }
-        }
-
-        return activeAlarmDate
-    }
-
     // Function to split time (in ms) into days, hours and minutes
     function _split_time(totalTime) {
         // increase by a minute, so we could make a nicer time

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2016-02-17 22:19:15 +0000
+++ app/alarm/EditAlarmPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -31,22 +31,26 @@
     property var tempAlarm
     property bool isNewAlarm: true
 
-    title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
     visible: false
 
-    head.actions: Action {
-        id: saveAlarmButton
-        iconName: "ok"
-        objectName: "saveAlarmAction"
-        text: i18n.tr("Alarm")
-        onTriggered: {
-            if(isNewAlarm) {
-                saveNewAlarm()
-            }
-            else {
-                updateAlarm()
-            }
-        }
+    header: PageHeader {
+        title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
+        trailingActionBar.actions: [
+            Action {
+                id: saveAlarmButton
+                iconName: "ok"
+                objectName: "saveAlarmAction"
+                text: i18n.tr("Alarm")
+                onTriggered: {
+                    if(isNewAlarm) {
+                        saveNewAlarm()
+                    }
+                    else {
+                        updateAlarm()
+                    }
+                }
+            }
+        ]
     }
 
     Component.onCompleted: {
@@ -225,7 +229,7 @@
         id: _alarmColumn
 
         width: parent.width
-        anchors.top: parent.top
+        anchors.top: _addAlarmPage.header.bottom
 
         DatePicker {
             id: _timePicker

=== modified file 'app/alarm/SoundPeerPicker.qml'
--- app/alarm/SoundPeerPicker.qml	2015-10-22 16:49:23 +0000
+++ app/alarm/SoundPeerPicker.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/clock/ClockPage.qml'
--- app/clock/ClockPage.qml	2016-02-18 14:47:46 +0000
+++ app/clock/ClockPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -31,13 +31,13 @@
     // Property to keep track of the clock mode
     property alias isDigital: clock.isDigital
 
-    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
+    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
     property string notLocalizedClockTimeString
 
     // String with localized time, eg.: "4:10 PM"
     property string localizedClockTimeString
 
-    // String with localized date, eg.: "Thursday, 17 September 2015"
+    // String with localized date, eg.: "Thursday, 17 September 2016"
     property string localizedClockDateString
 
     // Property to keep track of app cold start status

=== modified file 'app/clock/MainClock.qml'
--- app/clock/MainClock.qml	2016-02-17 19:53:15 +0000
+++ app/clock/MainClock.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/ActionIcon.qml'
--- app/components/ActionIcon.qml	2016-02-15 16:00:47 +0000
+++ app/components/ActionIcon.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/AnalogMode.qml'
--- app/components/AnalogMode.qml	2016-02-22 13:21:13 +0000
+++ app/components/AnalogMode.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/AnalogShadow.qml'
--- app/components/AnalogShadow.qml	2015-10-22 16:49:23 +0000
+++ app/components/AnalogShadow.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/Clock.qml'
--- app/components/Clock.qml	2016-02-15 17:05:25 +0000
+++ app/components/Clock.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -41,13 +41,13 @@
 Item {
     id: _clockContainer
 
-    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2015:10:05:16:10:15"
+    // String with not localized date and time in format "yyyy:MM:dd:hh:mm:ss", eg.: "2016:10:05:16:10:15"
     property string notLocalizedDateTimeString
 
     // String with localized time, eg.: "4:10 PM"
     property string localizedTimeString
 
-    // String with localized date, eg.: "Thursday, 17 September 2015"
+    // String with localized date, eg.: "Thursday, 17 September 2016"
     property string localizedDateString
 
     // Property to keep track of the clock mode

=== modified file 'app/components/ClockCircle.qml'
--- app/components/ClockCircle.qml	2016-02-18 15:34:29 +0000
+++ app/components/ClockCircle.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/DigitalMode.qml'
--- app/components/DigitalMode.qml	2016-02-17 19:53:15 +0000
+++ app/components/DigitalMode.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/DigitalShadow.qml'
--- app/components/DigitalShadow.qml	2015-10-22 16:49:23 +0000
+++ app/components/DigitalShadow.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2016-02-16 17:29:34 +0000
+++ app/components/EmptyState.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/ExpandableListItem.qml'
--- app/components/ExpandableListItem.qml	2016-02-15 19:36:13 +0000
+++ app/components/ExpandableListItem.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/HeaderNavigation.qml'
--- app/components/HeaderNavigation.qml	2016-02-17 22:19:15 +0000
+++ app/components/HeaderNavigation.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/components/Shadow.qml'
--- app/components/Shadow.qml	2015-10-22 16:49:23 +0000
+++ app/components/Shadow.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/stopwatch/LapListView.qml'
--- app/stopwatch/LapListView.qml	2016-02-17 22:19:15 +0000
+++ app/stopwatch/LapListView.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/stopwatch/StopwatchFace.qml'
--- app/stopwatch/StopwatchFace.qml	2016-02-16 17:07:09 +0000
+++ app/stopwatch/StopwatchFace.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/stopwatch/StopwatchPage.qml'
--- app/stopwatch/StopwatchPage.qml	2016-02-17 22:19:15 +0000
+++ app/stopwatch/StopwatchPage.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/ubuntu-clock-app.qml'
--- app/ubuntu-clock-app.qml	2016-02-25 17:50:48 +0000
+++ app/ubuntu-clock-app.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -126,8 +126,6 @@
             */
 
             alarmModel: alarmModelLoader.item
-            bottomEdgeEnabled: alarmModelLoader.status === Loader.Ready && alarmModelLoader.item.isReady && isClockPage
-
             /*
                FIXME: When the upstream QT bug at
                https://bugreports.qt-project.org/browse/QTBUG-40275 is fixed

=== modified file 'app/upstreamcomponents/CMakeLists.txt'
--- app/upstreamcomponents/CMakeLists.txt	2015-08-29 01:27:20 +0000
+++ app/upstreamcomponents/CMakeLists.txt	2016-02-25 23:11:58 +0000
@@ -1,8 +1,6 @@
 set(UPSTREAM_COMPONENTS_QML_JS_FILES
-    FakeHeader.qml
     FastScroll.js
     FastScroll.qml
-    PageWithBottomEdge.qml
 )
 
 # make the files visible in the qtcreator tree

=== removed file 'app/upstreamcomponents/FakeHeader.qml'
--- app/upstreamcomponents/FakeHeader.qml	2015-12-11 02:11:11 +0000
+++ app/upstreamcomponents/FakeHeader.qml	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014-2015 Canonical Ltd
- *
- * This file is part of Ubuntu Clock App
- *
- * Ubuntu Clock App 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.
- *
- * Ubuntu Clock App 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
-
-Column {
-    id: fakeHeader
-
-    height: units.gu(6.125)
-
-    Rectangle {
-        height: units.gu(6)
-        width: parent.width
-        color: Theme.palette.normal.background
-    }
-    
-    Rectangle {
-        color: "#C9C9C9"
-        height: units.gu(0.125)
-        anchors.left: parent.left
-        anchors.right: parent.right
-    }
-}

=== removed file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml	2015-12-11 02:11:11 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml	1970-01-01 00:00:00 +0000
@@ -1,449 +0,0 @@
-/*
- * 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.4
-import Ubuntu.Components 1.3
-
-Page {
-    id: page
-
-    property alias bottomEdgePageComponent: edgeLoader.sourceComponent
-    property alias bottomEdgePageSource: edgeLoader.source
-    property alias bottomEdgeTitle: tipLabel.text
-    property bool bottomEdgeEnabled: true
-    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: ((bottomEdge.y === fakeHeader.height) && bottomEdgePageLoaded && edgeLoader.item.active)
-    readonly property bool isCollapsed: (bottomEdge.y === page.height)
-    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
-    }
-
-    UbuntuShape {
-        id: tip
-        objectName: "bottomEdgeTip"
-
-        property bool hiden: (activeFocus === false) ||
-                             ((bottomEdge.y - units.gu(1)) < tip.y)
-
-        property bool isAnimating: true
-
-        enabled: mouseArea.enabled
-        visible: page.bottomEdgeEnabled
-        anchors {
-            bottom: parent.bottom
-            horizontalCenter: bottomEdge.horizontalCenter
-            bottomMargin: hiden ? - height + units.gu(1) : -units.gu(1)
-            Behavior on bottomMargin {
-                SequentialAnimation {
-                    // wait some msecs in case of the focus change again, to avoid flickering
-                    PauseAnimation {
-                        duration: 300
-                    }
-                    UbuntuNumberAnimation {
-                        duration: UbuntuAnimation.SnapDuration
-                    }
-                    ScriptAction {
-                        script: tip.isAnimating = false
-                    }
-                }
-            }
-        }
-
-        z: 1
-        width: tipLabel.paintedWidth + units.gu(6)
-        height: bottomEdge.tipHeight + units.gu(1)
-        backgroundColor: 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
-            opacity: tip.hiden ? 0.0 : 1.0
-            Behavior on opacity {
-                UbuntuNumberAnimation {
-                    duration: UbuntuAnimation.SnapDuration
-                }
-            }
-        }
-    }
-
-    Rectangle {
-        id: shadow
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: units.gu(1)
-        z: 1
-        opacity: 0.0
-        gradient: Gradient {
-            GradientStop { position: 0.0; color: "transparent" }
-            GradientStop { position: 1.0; color: Qt.rgba(0, 0, 0, 0.2) }
-        }
-    }
-
-    MouseArea {
-        id: mouseArea
-
-        property real previousY: -1
-        property string dragDirection: "None"
-
-        preventStealing: true
-        drag {
-            axis: Drag.YAxis
-            target: bottomEdge
-            minimumY: bottomEdge.pageStartY
-            maximumY: page.height
-        }
-        enabled: edgeLoader.status == Loader.Ready
-        visible: page.bottomEdgeEnabled
-
-        anchors {
-            left: parent.left
-            right: parent.right
-            bottom: parent.bottom
-        }
-        height: bottomEdge.tipHeight
-        z: 1
-
-        onReleased: {
-            page.bottomEdgeReleased()
-            if ((dragDirection === "BottomToTop") &&
-                    bottomEdge.y < (page.height - bottomEdgeExpandThreshold - bottomEdge.tipHeight)) {
-                bottomEdge.state = "expanded"
-            } else {
-                bottomEdge.state = "collapsed"
-            }
-            previousY = -1
-            dragDirection = "None"
-        }
-
-        onPressed: {
-            previousY = mouse.y
-            tip.forceActiveFocus()
-        }
-
-        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"
-        }
-    }
-
-    FakeHeader {
-        id: fakeHeader
-
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        y: -fakeHeader.height + (fakeHeader.height * (page.height - bottomEdge.y)) / (page.height - fakeHeader.height)
-        z: bgVisual.z + 1
-
-        Behavior on y {
-            UbuntuNumberAnimation {
-                duration: UbuntuAnimation.SnapDuration
-            }
-        }
-    }
-
-    Rectangle {
-        id: bottomEdge
-        objectName: "bottomEdge"
-
-        readonly property int tipHeight: units.gu(3)
-        readonly property int pageStartY: fakeHeader.height
-
-        z: 1
-        color: Theme.palette.normal.background
-        clip: true
-        anchors {
-            left: parent.left
-            right: parent.right
-        }
-        height: page.height
-        y: height
-
-        visible: !page.isCollapsed
-        state: "collapsed"
-        states: [
-            State {
-                name: "collapsed"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.height
-                }
-                PropertyChanges {
-                    target: fakeHeader
-                    y: -fakeHeader.height
-                }
-            },
-            State {
-                name: "expanded"
-                PropertyChanges {
-                    target: bottomEdge
-                    y: bottomEdge.pageStartY
-                }
-                PropertyChanges {
-                    target: fakeHeader
-                    y: 0
-                }
-            },
-            State {
-                name: "floating"
-                when: mouseArea.drag.active
-                PropertyChanges {
-                    target: shadow
-                    opacity: 1.0
-                }
-            }
-        ]
-
-        transitions: [
-            Transition {
-                to: "expanded"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-                    ParallelAnimation {
-                        SmoothedAnimation {
-                            target: bottomEdge
-                            property: "y"
-                            duration: UbuntuAnimation.FastDuration
-                            easing.type: Easing.Linear
-                        }
-                        SmoothedAnimation {
-                            target: fakeHeader
-                            property: "y"
-                            duration: UbuntuAnimation.FastDuration
-                            easing.type: Easing.Linear
-                        }
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: - units.gu(4)
-                        duration: UbuntuAnimation.FastDuration
-                        easing.type: Easing.Linear
-                    }
-                    SmoothedAnimation {
-                        target: edgeLoader
-                        property: "anchors.topMargin"
-                        to: 0
-                        duration: UbuntuAnimation.FastDuration
-                        easing: UbuntuAnimation.StandardEasing
-                    }
-                    ScriptAction {
-                        script: page._pushPage()
-                    }
-                }
-            },
-            Transition {
-                from: "expanded"
-                to: "collapsed"
-                SequentialAnimation {
-                    alwaysRunToEnd: true
-
-                    ScriptAction {
-                        script: {
-                            Qt.inputMethod.hide()
-                            edgeLoader.item.parent = edgeLoader
-                            edgeLoader.item.anchors.fill = edgeLoader
-                            edgeLoader.item.active = false
-                        }
-                    }
-                    ParallelAnimation {
-                        SmoothedAnimation {
-                            target: bottomEdge
-                            property: "y"
-                            duration: UbuntuAnimation.SlowDuration
-                        }
-                        SmoothedAnimation {
-                            target: fakeHeader
-                            property: "y"
-                            duration: UbuntuAnimation.SlowDuration
-                        }
-                    }
-                    ScriptAction {
-                        script: {
-                            // destroy current bottom page
-                            if (page.reloadBottomEdgePage) {
-                                edgeLoader.active = false
-                            } else {
-                                tip.forceActiveFocus()
-                            }
-
-                            // notify
-                            page.bottomEdgeDismissed()
-
-                            edgeLoader.active = true
-                        }
-                    }
-                }
-            },
-            Transition {
-                from: "floating"
-                to: "collapsed"
-                UbuntuNumberAnimation {
-                    target: bottomEdge
-                    property: "opacity"
-                }
-            }
-        ]
-
-        Loader {
-            id: edgeLoader
-
-            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.status === Loader.Ready ? edgeLoader : null
-                property: "anchors.topMargin"
-                value:  edgeLoader.item && edgeLoader.item.flickable ? edgeLoader.item.flickable.contentY : 0
-                when: !page.isReady
-            }
-
-            onLoaded: {
-                tip.forceActiveFocus()
-                if (page.isReady && edgeLoader.item.active !== true) {
-                    page._pushPage()
-                }
-            }
-        }
-    }
-}

=== modified file 'app/upstreamcomponents/README.components'
--- app/upstreamcomponents/README.components	2015-08-29 01:27:20 +0000
+++ app/upstreamcomponents/README.components	2016-02-25 23:11:58 +0000
@@ -4,10 +4,6 @@
 
 #### Links
 
-PageWithBottomEdge.qml
-
-https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/PageWithBottomEdge.qml
-
 FastScroll.js
 
 https://bazaar.launchpad.net/~phablet-team/address-book-app/trunk/view/head:/src/imports/Ubuntu/Contacts/FastScroll.js

=== modified file 'app/worldclock/AddWorldCityButton.qml'
--- app/worldclock/AddWorldCityButton.qml	2016-02-17 19:53:15 +0000
+++ app/worldclock/AddWorldCityButton.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'app/worldclock/UserWorldCityDelegate.qml'
--- app/worldclock/UserWorldCityDelegate.qml	2016-02-17 21:30:07 +0000
+++ app/worldclock/UserWorldCityDelegate.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -33,6 +33,7 @@
 
     height: units.gu(9)
     divider.visible: false
+    highlightColor: "Transparent"
 
     Item {
         id: delegate

=== modified file 'app/worldclock/UserWorldCityList.qml'
--- app/worldclock/UserWorldCityList.qml	2015-10-22 16:49:23 +0000
+++ app/worldclock/UserWorldCityList.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *
@@ -21,12 +21,13 @@
 import U1db 1.0 as U1db
 import Ubuntu.Components 1.3
 
-ListView {
+UbuntuListView {
     id: worldCityColumn
     objectName: "userWorldCityRepeater"
 
     clip: true
     anchors.fill: parent
+    currentIndex: -1
 
     onFlickStarted:  {
         forceActiveFocus()

=== modified file 'app/worldclock/WorldCityList.qml'
--- app/worldclock/WorldCityList.qml	2016-02-25 18:41:20 +0000
+++ app/worldclock/WorldCityList.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/backend.cpp'
--- backend/modules/Alarm/backend.cpp	2015-08-26 23:35:50 +0000
+++ backend/modules/Alarm/backend.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/backend.h'
--- backend/modules/Alarm/backend.h	2015-08-25 15:29:02 +0000
+++ backend/modules/Alarm/backend.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/settings.cpp'
--- backend/modules/Alarm/settings.cpp	2015-08-25 15:29:02 +0000
+++ backend/modules/Alarm/settings.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/settings.h'
--- backend/modules/Alarm/settings.h	2015-08-25 15:29:02 +0000
+++ backend/modules/Alarm/settings.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/sound.cpp'
--- backend/modules/Alarm/sound.cpp	2015-08-25 15:41:50 +0000
+++ backend/modules/Alarm/sound.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Alarm/sound.h'
--- backend/modules/Alarm/sound.h	2015-09-11 13:54:12 +0000
+++ backend/modules/Alarm/sound.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Stopwatch/backend.cpp'
--- backend/modules/Stopwatch/backend.cpp	2015-09-09 21:30:53 +0000
+++ backend/modules/Stopwatch/backend.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Stopwatch/backend.h'
--- backend/modules/Stopwatch/backend.h	2015-08-24 23:37:28 +0000
+++ backend/modules/Stopwatch/backend.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Stopwatch/engine.cpp'
--- backend/modules/Stopwatch/engine.cpp	2015-09-11 13:37:43 +0000
+++ backend/modules/Stopwatch/engine.cpp	2016-02-25 23:11:58 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
- * Copyright: 2015 Michael Zanetti <[e-mail]>                 *
- *            2015 Bartosz Kosiorek <[e-mail]>                  *
+ * Copyright: 2015-2016 Michael Zanetti <[e-mail]>            *
+ *            2015-2016 Bartosz Kosiorek <[e-mail]>             *
  *                                                                           *
  * This prject is free software: you can redistribute it and/or modify       *
  * it under the terms of the GNU General Public License as published by      *

=== modified file 'backend/modules/Stopwatch/engine.h'
--- backend/modules/Stopwatch/engine.h	2015-09-11 13:37:43 +0000
+++ backend/modules/Stopwatch/engine.h	2016-02-25 23:11:58 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
- * Copyright: 2015 Michael Zanetti <[e-mail]>                 *
- *            2015 Bartosz Kosiorek <[e-mail]>                  *
+ * Copyright: 2015-2016 Michael Zanetti <[e-mail]>            *
+ *            2015-2016 Bartosz Kosiorek <[e-mail]>             *
  *                                                                           *
  * This prject is free software: you can redistribute it and/or modify       *
  * it under the terms of the GNU General Public License as published by      *

=== modified file 'backend/modules/Stopwatch/formattime.cpp'
--- backend/modules/Stopwatch/formattime.cpp	2016-02-15 15:05:13 +0000
+++ backend/modules/Stopwatch/formattime.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/Stopwatch/formattime.h'
--- backend/modules/Stopwatch/formattime.h	2015-09-11 13:54:12 +0000
+++ backend/modules/Stopwatch/formattime.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/backend.cpp'
--- backend/modules/WorldClock/backend.cpp	2015-08-26 23:30:10 +0000
+++ backend/modules/WorldClock/backend.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/backend.h'
--- backend/modules/WorldClock/backend.h	2015-08-25 15:54:39 +0000
+++ backend/modules/WorldClock/backend.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/datetime.cpp'
--- backend/modules/WorldClock/datetime.cpp	2015-10-06 22:34:27 +0000
+++ backend/modules/WorldClock/datetime.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/datetime.h'
--- backend/modules/WorldClock/datetime.h	2015-10-06 22:34:27 +0000
+++ backend/modules/WorldClock/datetime.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/generictimezonemodel.cpp'
--- backend/modules/WorldClock/generictimezonemodel.cpp	2015-08-29 01:27:20 +0000
+++ backend/modules/WorldClock/generictimezonemodel.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/generictimezonemodel.h'
--- backend/modules/WorldClock/generictimezonemodel.h	2015-08-29 01:27:20 +0000
+++ backend/modules/WorldClock/generictimezonemodel.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/geolocation.cpp'
--- backend/modules/WorldClock/geolocation.cpp	2015-08-25 15:54:39 +0000
+++ backend/modules/WorldClock/geolocation.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/geolocation.h'
--- backend/modules/WorldClock/geolocation.h	2015-08-25 15:54:39 +0000
+++ backend/modules/WorldClock/geolocation.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/jsontimezonemodel.cpp'
--- backend/modules/WorldClock/jsontimezonemodel.cpp	2015-08-25 16:11:38 +0000
+++ backend/modules/WorldClock/jsontimezonemodel.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/jsontimezonemodel.h'
--- backend/modules/WorldClock/jsontimezonemodel.h	2015-08-25 16:11:38 +0000
+++ backend/modules/WorldClock/jsontimezonemodel.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/statictimezonemodel.cpp'
--- backend/modules/WorldClock/statictimezonemodel.cpp	2015-09-10 11:10:13 +0000
+++ backend/modules/WorldClock/statictimezonemodel.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/statictimezonemodel.h'
--- backend/modules/WorldClock/statictimezonemodel.h	2015-08-25 16:11:38 +0000
+++ backend/modules/WorldClock/statictimezonemodel.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2015 Canonical Ltd
+* Copyright (C) 2015-2016 Canonical Ltd
 *
 * This file is part of Ubuntu Clock App
 *

=== modified file 'backend/modules/WorldClock/timezonemodel.cpp'
--- backend/modules/WorldClock/timezonemodel.cpp	2015-10-06 22:02:45 +0000
+++ backend/modules/WorldClock/timezonemodel.cpp	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'backend/modules/WorldClock/timezonemodel.h'
--- backend/modules/WorldClock/timezonemodel.h	2015-09-17 05:36:41 +0000
+++ backend/modules/WorldClock/timezonemodel.h	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-02 23:45:47 +0000
+++ debian/changelog	2016-02-25 23:11:58 +0000
@@ -5,10 +5,26 @@
   * Move to use the new SDK components v1.3 (LP: #1508363)
   * Fix continously move the alarm volume slider to the desired value (LP: #1492584)
   * Fix wrong alarm caption which appears during high load (LP: #1530000)
+  * Implemented new UI design according to design specs (LP: #1528241)
+  * Removed SURU bar from all views (LP: #1543492)
+
+  [ Nicholas Skaggs ]
+  * Fixed test launching and added option for building with SDK
+  * Removed fixtures and debug_print_trees
 
   [ Andrew Hayzen ]
   * Fixes for various autopilot issues (LP: #1535488)
 
+  [ Michal Predotka ]
+  * Fix stopwatch start button being too wide (LP: #1543475)
+  * Updated all list items to the new ListItemLayout (LP: #1543472)
+  * Added ability to start/stop stopwatch by clicking on clock face (LP: #1543479)
+  * Fix settings page list items using the wrong font color (LP: #1543501)
+
+  [ Nekhelesh Ramananthan ]
+  * Fix 'Shutter' effect animation on title bar when opening bottom edge (LP: #1543496)
+  * Migrate to the new SDK Bottom edge (LP: #1549988)
+
  -- Bartosz Kosiorek <[e-mail]>  Wed, 30 Dec 2015 01:43:24 +0100
 
 ubuntu-clock-app (3.6)  vivid; urgency=medium

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2016-02-17 21:47:42 +0000
+++ po/com.ubuntu.clock.pot	2016-02-25 23:11:58 +0000
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the  package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-17 22:46+0100\n"
+"POT-Creation-Date: 2016-02-26 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,51 +18,46 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../app/MainPage.qml:53 ../app/alarm/AlarmUtils.qml:55
-msgid "No active alarms"
+#: ../app/MainPage.qml:63 ../app/alarm/AlarmPage.qml:34
+msgid "Alarms"
 msgstr ""
 
 #: ../app/alarm/AlarmLabel.qml:33 ../app/alarm/AlarmLabel.qml:71
-#: ../app/alarm/EditAlarmPage.qml:294
+#: ../app/alarm/EditAlarmPage.qml:297
 msgid "Label"
 msgstr ""
 
-#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:101
-#: ../app/worldclock/UserWorldCityList.qml:69
+#: ../app/alarm/AlarmList.qml:61 ../app/alarm/AlarmPage.qml:99
+#: ../app/worldclock/UserWorldCityList.qml:70
 msgid "Delete"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:27
-msgid "Alarms"
+#: ../app/alarm/AlarmPage.qml:48 ../app/alarm/EditAlarmPage.qml:43
+#: ../app/alarm/EditAlarmPage.qml:188
+msgid "Alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:41 ../app/alarm/AlarmPage.qml:66
-#: ../app/worldclock/WorldCityList.qml:79
+#: ../app/alarm/AlarmPage.qml:62 ../app/worldclock/WorldCityList.qml:79
 msgid "Back"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:41
-#: ../app/alarm/EditAlarmPage.qml:185
-msgid "Alarm"
-msgstr ""
-
-#: ../app/alarm/AlarmPage.qml:76
+#: ../app/alarm/AlarmPage.qml:74
 msgid "Select None"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:78 ../app/alarm/AlarmRepeat.qml:59
+#: ../app/alarm/AlarmPage.qml:76 ../app/alarm/AlarmRepeat.qml:59
 msgid "Select All"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:152
+#: ../app/alarm/AlarmPage.qml:155
 msgid "No saved alarms"
 msgstr ""
 
-#: ../app/alarm/AlarmPage.qml:153
+#: ../app/alarm/AlarmPage.qml:156
 msgid "Tap the + icon to add an alarm"
 msgstr ""
 
-#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:279
+#: ../app/alarm/AlarmRepeat.qml:36 ../app/alarm/EditAlarmPage.qml:282
 msgid "Repeat"
 msgstr ""
 
@@ -104,7 +99,7 @@
 msgid "Change time and date"
 msgstr ""
 
-#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:314
+#: ../app/alarm/AlarmSound.qml:30 ../app/alarm/EditAlarmPage.qml:317
 msgid "Sound"
 msgstr ""
 
@@ -136,39 +131,34 @@
 msgid "Daily"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:82
-#, qt-format
-msgid "Next Alarm %1"
-msgstr ""
-
-#: ../app/alarm/AlarmUtils.qml:103
+#: ../app/alarm/AlarmUtils.qml:70
 msgid "Alarm Passed"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:113
+#: ../app/alarm/AlarmUtils.qml:80
 #, no-c-format, qt-format
 msgid "in %1d %2h %3m"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:123
+#: ../app/alarm/AlarmUtils.qml:90
 #, no-c-format, qt-format
 msgid "in %1h %2m"
 msgstr ""
 
-#: ../app/alarm/AlarmUtils.qml:132
+#: ../app/alarm/AlarmUtils.qml:99
 #, no-c-format, qt-format
 msgid "in %1m"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:34
+#: ../app/alarm/EditAlarmPage.qml:37
 msgid "New alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:34
+#: ../app/alarm/EditAlarmPage.qml:37
 msgid "Edit alarm"
 msgstr ""
 
-#: ../app/alarm/EditAlarmPage.qml:337
+#: ../app/alarm/EditAlarmPage.qml:339
 msgid "Delete alarm"
 msgstr ""
 
@@ -177,7 +167,7 @@
 msgid "Add sound from"
 msgstr ""
 
-#: ../app/clock/ClockPage.qml:245
+#: ../app/clock/ClockPage.qml:244
 msgid "Retrieving location..."
 msgstr ""
 
@@ -222,37 +212,37 @@
 
 #. TRANSLATORS: this indicates if the time in a world clock
 #. is behind or ahead of the time at the current location
-#: ../app/worldclock/UserWorldCityDelegate.qml:135
+#: ../app/worldclock/UserWorldCityDelegate.qml:136
 msgid "behind"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:136
+#: ../app/worldclock/UserWorldCityDelegate.qml:137
 msgid "ahead"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by
 #. minute, and the translation for either 'behind' or
 #. 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:146
+#: ../app/worldclock/UserWorldCityDelegate.qml:147
 #, qt-format
 msgid "%1h %2m %3"
 msgstr ""
 
 #. TRANSLATORS: the first argument is hour, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:155
+#: ../app/worldclock/UserWorldCityDelegate.qml:156
 #, qt-format
 msgid "%1h %2"
 msgstr ""
 
 #. TRANSLATORS: the first argument is minute, followed by the
 #. translation for either 'behind' or 'ahead'
-#: ../app/worldclock/UserWorldCityDelegate.qml:163
+#: ../app/worldclock/UserWorldCityDelegate.qml:164
 #, qt-format
 msgid "%1m %2"
 msgstr ""
 
-#: ../app/worldclock/UserWorldCityDelegate.qml:169
+#: ../app/worldclock/UserWorldCityDelegate.qml:170
 msgid "Same time"
 msgstr ""
 

=== modified file 'tests/unit/ClockTestCase.qml'
--- tests/unit/ClockTestCase.qml	2016-02-25 17:07:00 +0000
+++ tests/unit/ClockTestCase.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/MockClockApp.qml'
--- tests/unit/MockClockApp.qml	2015-10-22 16:49:23 +0000
+++ tests/unit/MockClockApp.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_alarm.qml'
--- tests/unit/tst_alarm.qml	2015-12-11 02:13:16 +0000
+++ tests/unit/tst_alarm.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_alarmLabel.qml'
--- tests/unit/tst_alarmLabel.qml	2016-02-25 17:07:00 +0000
+++ tests/unit/tst_alarmLabel.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_alarmRepeat.qml'
--- tests/unit/tst_alarmRepeat.qml	2016-02-25 17:40:26 +0000
+++ tests/unit/tst_alarmRepeat.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_alarmSound.qml'
--- tests/unit/tst_alarmSound.qml	2015-10-22 16:49:23 +0000
+++ tests/unit/tst_alarmSound.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_alarmUtils.qml'
--- tests/unit/tst_alarmUtils.qml	2016-02-25 17:40:26 +0000
+++ tests/unit/tst_alarmUtils.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_stopwatchUtils.qml'
--- tests/unit/tst_stopwatchUtils.qml	2016-02-25 17:40:26 +0000
+++ tests/unit/tst_stopwatchUtils.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015 Canonical Ltd
+ * Copyright (C) 2015-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *

=== modified file 'tests/unit/tst_worldClock.qml'
--- tests/unit/tst_worldClock.qml	2015-10-22 16:49:23 +0000
+++ tests/unit/tst_worldClock.qml	2016-02-25 23:11:58 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical Ltd
+ * Copyright (C) 2014-2016 Canonical Ltd
  *
  * This file is part of Ubuntu Clock App
  *