Merge lp:~bfiller/dialer-app/rtm-14.09-sim-presence into lp:dialer-app/rtm-14.09

[Bill Filler]

sim presence and call grouping merge from trunk

sim presence and call grouping merge from trunk

=== modified file 'po/dialer-app.pot'
--- po/dialer-app.pot	2014-07-17 17:56:04 +0000
+++ po/dialer-app.pot	2014-08-22 15:27:37 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-16 19:26+0200\n"
+"POT-Creation-Date: 2014-08-15 18:33-0300\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,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/qml/DialerPage/Keypad.qml:202
+#: src/qml/DialerPage/Keypad.qml:174
 msgid "#"
 msgstr ""
 
@@ -43,140 +43,152 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/qml/DialerPage/Keypad.qml:179
+#: src/qml/DialerPage/Keypad.qml:150
 msgid "*"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:189
+#: src/qml/DialerPage/Keypad.qml:161 src/qml/DialerPage/DialerPage.qml:326
 msgid "+"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:188
+#: src/qml/ContactsPage/ContactsPage.qml:186
+msgid "+ Create New"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:160
 msgid "0"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:86
+#: src/qml/DialerPage/Keypad.qml:49
 msgid "1"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:97
+#: src/qml/DialerPage/Keypad.qml:60
 msgid "2"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:107
+#: src/qml/DialerPage/Keypad.qml:71
 msgid "3"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:117
+#: src/qml/DialerPage/Keypad.qml:82
 msgid "4"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:127
+#: src/qml/DialerPage/Keypad.qml:93
 msgid "5"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:137
+#: src/qml/DialerPage/Keypad.qml:104
 msgid "6"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:147
+#: src/qml/DialerPage/Keypad.qml:115
 msgid "7"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:157
+#: src/qml/DialerPage/Keypad.qml:126
 msgid "8"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:167
+#: src/qml/DialerPage/Keypad.qml:137
 msgid "9"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:98
+#: src/qml/DialerPage/Keypad.qml:61
 msgid "ABC"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:80
-msgid "Add Contact"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:42
-msgid "Add to existing contact"
-msgstr ""
-
-#: src/qml/dialer-app.qml:244
+#: src/qml/ContactsPage/ContactsPage.qml:71
+msgid "All"
+msgstr ""
+
+#: src/qml/dialer-app.qml:376
 msgid "Call Barring"
 msgstr ""
 
-#: src/qml/dialer-app.qml:255
+#: src/qml/dialer-app.qml:387
 msgid "Call Forwarding"
 msgstr ""
 
-#: src/qml/dialer-app.qml:266
+#: src/qml/dialer-app.qml:398
 msgid "Call Waiting"
 msgstr ""
 
-#: src/qml/MainPage.qml:56
-msgid "Call log"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:114
-msgid "Call now"
-msgstr ""
-
-#: src/qml/dialer-app.qml:277
+#: src/qml/dialer-app.qml:409
 msgid "Calling Line Presentation"
 msgstr ""
 
-#: src/qml/dialer-app.qml:289
+#: src/qml/dialer-app.qml:421
 msgid "Calling Line Restriction"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:60
+#: src/qml/ContactsPage/ContactsPage.qml:85
 msgid "Cancel"
 msgstr ""
 
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:29
+msgid "Change all Call associations to "
+msgstr ""
+
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:30 src/qml/dialer-app.qml:270
+msgid "Close"
+msgstr ""
+
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:114
-#: src/qml/LiveCallPage/LiveCall.qml:49
 msgid "Conference"
 msgstr ""
 
-#: src/qml/dialer-app.qml:283
+#: src/qml/dialer-app.qml:415
 msgid "Connected Line Presentation"
 msgstr ""
 
-#: src/qml/dialer-app.qml:295
+#: src/qml/dialer-app.qml:427
 msgid "Connected Line Restriction"
 msgstr ""
 
-#: src/qml/MainPage.qml:45
+#: src/qml/ContactsPage/ContactsPage.qml:32
+#: src/qml/DialerPage/DialerPage.qml:39
 msgid "Contacts"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:51
-msgid "Create new contact"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:108
+#: src/qml/DialerPage/Keypad.qml:72
 msgid "DEF"
 msgstr ""
 
-#: src/qml/HistoryPage/HistoryPage.qml:69
+#: src/qml/HistoryPage/HistoryPage.qml:271
 msgid "Delete"
 msgstr ""
 
-#: src/qml/dialer-app.qml:169 src/qml/dialer-app.qml:183
+#: src/qml/HistoryPage/HistoryPage.qml:279
+msgid "Details"
+msgstr ""
+
+#: src/qml/dialer-app.qml:306 src/qml/dialer-app.qml:320
 msgid "Dismiss"
 msgstr ""
 
-#: src/qml/DialerPage/DialerPage.qml:89
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:66
+msgid "Don't ask again"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:223
 msgid "Enter a number"
 msgstr ""
 
-#: src/qml/dialer-app.qml:166
+#: src/qml/dialer-app.qml:303
 msgid "Error"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:118
+#: src/qml/ContactsPage/ContactsPage.qml:71
+msgid "Favorites"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:51
+msgid "Flight mode"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:83
 msgid "GHI"
 msgstr ""
 
@@ -184,23 +196,27 @@
 msgid "Hangup"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:39
-msgid "How do you want to save the contact?"
+#: src/qml/HistoryPage/HistoryDelegate.qml:60
+msgid "Incoming"
 msgstr ""
 
-#: src/qml/dialer-app.qml:167
+#: src/qml/dialer-app.qml:304
 msgid "Invalid USSD code"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:128
+#: src/qml/DialerPage/Keypad.qml:94
 msgid "JKL"
 msgstr ""
 
-#: src/qml/MainPage.qml:35
+#: src/qml/DialerPage/DialerPage.qml:57
 msgid "Keypad"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:138
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80
+msgid "Later"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:105
 msgid "MNO"
 msgstr ""
 
@@ -208,15 +224,36 @@
 msgid "Merge calls"
 msgstr ""
 
-#: src/qml/LiveCallPage/LiveCall.qml:75
-msgid "New call"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:148
+#: src/qml/HistoryPage/HistoryDelegate.qml:58
+msgid "Missed"
+msgstr ""
+
+#: src/qml/LiveCallPage/LiveCall.qml:60
+msgid "New Call"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:39
+msgid "No"
+msgstr ""
+
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:26
+msgid "No SIM card selected"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:59 src/qml/dialer-app.qml:265
+msgid "No network"
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryDelegate.qml:62
+msgid "Outgoing"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:116
 msgid "PQRS"
 msgstr ""
 
-#: src/qml/dialer-app.qml:147
+#: src/qml/dialer-app.qml:284
 msgid "Please wait"
 msgstr ""
 
@@ -224,58 +261,96 @@
 msgid "Private"
 msgstr ""
 
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:38
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
-msgid "Save contact"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:124
-msgid "Send text message"
-msgstr ""
-
-#: src/qml/DialerPage/Keypad.qml:158
+#: src/qml/HistoryPage/HistoryDelegate.qml:171
+msgid "Private number"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:83 src/qml/HistoryPage/HistoryPage.qml:43
+msgid "Recent"
+msgstr ""
+
+#: src/qml/ContactsPage/ContactsPage.qml:60
+msgid "Search"
+msgstr ""
+
+#: src/qml/ContactsPage/ContactsPage.qml:48
+msgid "Search..."
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryPage.qml:43
+msgid "Select"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:58
+msgid ""
+"Select a default SIM for all outgoing calls. You can always alter your "
+"choice in <a href=\"system_settings\">System Settings</a>."
+msgstr ""
+
+#: src/qml/HistoryPage/HistoryPage.qml:292
+msgid "Send message"
+msgstr ""
+
+#: src/qml/DialerPage/DialerPage.qml:44
+msgid "Settings"
+msgstr ""
+
+#: src/qml/Dialogs/NoDefaultSIMCardDialog.qml:27
+msgid "Switch to default SIM:"
+msgstr ""
+
+#: src/qml/DialerPage/Keypad.qml:127
 msgid "TUV"
 msgstr ""
 
+#: src/qml/dialer-app.qml:266
+#, qt-format
+msgid "There is currently no network on %1"
+msgstr ""
+
+#: src/qml/dialer-app.qml:267
+msgid "There is currently no network."
+msgstr ""
+
 #: src/qml/HistoryPage/dateUtils.js:41
 msgid "Today"
 msgstr ""
 
-#: src/qml/LiveCallPage/LiveCall.qml:47
-msgid "Two Calls"
-msgstr ""
-
-#: src/qml/HistoryPage/HistoryDelegate.qml:139
-msgid "Unknown"
-msgstr ""
-
-#: src/qml/HistoryPage/CallLogContactDelegate.qml:134
-msgid "View contact"
+#: src/qml/HistoryPage/HistoryDelegate.qml:173
+msgid "Unknown number"
 msgstr ""
 
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:116
 msgid "Voicemail"
 msgstr ""
 
-#: src/qml/DialerPage/Keypad.qml:168
+#: src/qml/DialerPage/Keypad.qml:138
 msgid "WXYZ"
 msgstr ""
 
+#: src/qml/Dialogs/SetDefaultSIMCardDialog.qml:49
+msgid "Yes"
+msgstr ""
+
 #: src/qml/HistoryPage/dateUtils.js:43
 msgid "Yesterday"
 msgstr ""
 
+#: src/qml/Dialogs/NoSIMCardSelectedDialog.qml:27
+msgid "You need to select a SIM card"
+msgstr ""
+
+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:138
-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 msgid "active"
 msgstr ""
 
+#: src/qml/LiveCallPage/LiveCall.qml:237
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:134
-#: src/qml/LiveCallPage/LiveCall.qml:409
 msgid "calling"
 msgstr ""
 
+#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 #: src/qml/LiveCallPage/MultiCallDisplay.qml:136
-#: src/qml/LiveCallPage/ConferenceCallDisplay.qml:128
 msgid "on hold"
 msgstr ""

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-08-13 22:27:43 +0000
+++ src/qml/DialerPage/DialerPage.qml	2014-08-22 15:27:37 +0000
@@ -31,9 +31,8 @@
 
     property alias dialNumber: keypadEntry.value
     property alias input: keypadEntry.input
-    objectName: "dialerPage"
-
-    head.actions: [
+    property list<Action> actionsGreeter
+    property list<Action> actionsNormal: [
         Action {
             iconName: "contact"
             text: i18n.tr("Contacts")
@@ -45,23 +44,48 @@
             onTriggered: Qt.openUrlExternally("settings:///system/phone")
         }
     ]
-
-    title: i18n.tr("Keypad")
-
+    head.actions: greeter.greeterActive ? actionsGreeter : actionsNormal
+ 
+    objectName: "dialerPage"
+
+    title: {
+        if (telepathyHelper.flightMode) {
+            return i18n.tr("Flight mode")
+        } else if (mainView.account && mainView.account.networkName != "") {
+            return mainView.account.networkName
+        } else if (multipleAccounts && !mainView.account) {
+            // TODO: check what should be displayed when there are multiple accounts
+            // but no default selected
+            return i18n.tr("Keypad")
+        }
+        return i18n.tr("No network")
+    }
+
+    state: greeter.greeterActive ? "greeterMode" : "normalMode"
     // -------- Greeter mode ----------
     states: [
         State {
             name: "greeterMode"
-            when: greeter.greeterActive
-
-            PropertyChanges {
-                target: page.head
-                actions: []
-            }
-            PropertyChanges {
-                target: contactLabel
-                visible: false
-            }
+            PropertyChanges {
+                target: contactLabel
+                visible: false
+            }
+            PropertyChanges {
+                target: addContact
+                visible: false
+            }
+        },
+        State {
+            name: "normalMode"
+            PropertyChanges {
+                target: contactLabel
+                visible: true
+            }
+            PropertyChanges {
+                target: addContact
+                visible: true
+            }
+ 
         }
     ]
 
@@ -95,12 +119,6 @@
         }
     }
 
-    onIsReadyChanged: {
-        if (bottomEdgePage) {
-            bottomEdgePage.fullView = isReady
-        }
-    }
-
     function accountIndex(account) {
         var index = -1;
         for (var i in telepathyHelper.accounts) {
@@ -120,14 +138,11 @@
                 mainView.switchToKeypadView();
             }
         }
-        onAccountChanged: {
-            var newAccountIndex = accountIndex(account);
-            if (newAccountIndex >= 0 && newAccountIndex !== page.head.sections.selectedIndex) {
-                page.head.sections.selectedIndex = newAccountIndex
-            }
-        }
+        onAccountChanged: head.sections.selectedIndex = accountIndex(mainView.account)
     }
 
+    Component.onCompleted: head.sections.selectedIndex = accountIndex(mainView.account)
+
     head.sections.model: {
         // does not show dual sim switch if there is only one sim
         if (!multipleAccounts) {
@@ -135,24 +150,16 @@
         }
 
         var accountNames = []
-        for(var i=0; i < telepathyHelper.accounts.length; i++) {
-            accountNames.push(telepathyHelper.accounts[i].displayName)
+        for(var i=0; i < telepathyHelper.activeAccounts.length; i++) {
+            accountNames.push(telepathyHelper.activeAccounts[i].displayName)
         }
         return accountNames
     }
 
-    // Account switcher
-    head.sections.selectedIndex: {
-        if (!mainView.account) {
-            return -1
-        }
-        return accountIndex(mainView.account)
-    }
-
     Connections {
         target: page.head.sections
         onSelectedIndexChanged: {
-            mainView.account = telepathyHelper.accounts[page.head.sections.selectedIndex]
+            mainView.account = telepathyHelper.activeAccounts[page.head.sections.selectedIndex]
         }
     }
 
@@ -341,7 +348,7 @@
                 // check if at least one account is selected
                 if (multipleAccounts && !mainView.account) {
                     Qt.inputMethod.hide()
-                    PopupUtils.open(Qt.createObject("../Dialogs/NoSIMCardSelectedDialog.qml").createObject(page))
+                    PopupUtils.open(Qt.createComponent("../Dialogs/NoSIMCardSelectedDialog.qml").createObject(page))
                     return
                 }
 

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-11 21:58:24 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2014-08-22 15:27:37 +0000
@@ -35,7 +35,7 @@
                 anchors.horizontalCenter: parent.horizontalCenter
                 height: paintedHeight + units.gu(3)
                 Repeater {
-                    model: telepathyHelper.accounts
+                    model: telepathyHelper.activeAccounts
                     delegate: Label {
                         text: modelData.displayName
                         color: UbuntuColors.orange

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2014-08-11 19:27:34 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2014-08-22 15:27:37 +0000
@@ -95,7 +95,7 @@
 
         function updateSubTypeLabel() {
             var subLabel = contactWatcher.isUnknown
-            if (model.participants[0]) {
+            if (model.participants && model.participants[0]) {
                 var typeInfo = phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail))
                 if (typeInfo) {
                     subLabel = typeInfo.label
@@ -159,12 +159,14 @@
         id: titleLabel
         anchors {
             top: parent.top
+            topMargin: units.gu(0.5)
             left: avatar.right
             leftMargin: units.gu(2)
             right: time.left
+            rightMargin: units.gu(1) + (countLabel.visible ? countLabel.width : 0)
         }
         height: units.gu(2)
-        verticalAlignment: Text.AlignVCenter
+        verticalAlignment: Text.AlignTop
         fontSize: "medium"
         text: {
             if (contactWatcher.phoneNumber == "x-ofono-private") {
@@ -180,15 +182,41 @@
         color: UbuntuColors.lightAubergine
     }
 
+    // this item has the width of the text above. It is used to be able to align
+    Item {
+        id: titleLabelArea
+        anchors {
+            top: titleLabel.top
+            left: titleLabel.left
+            bottom: titleLabel.bottom
+        }
+        width: titleLabel.paintedWidth
+    }
+
+    Label {
+        id: countLabel
+        anchors {
+            left: titleLabelArea.right
+            leftMargin: units.gu(0.5)
+            top: titleLabel.top
+        }
+        height: units.gu(2)
+        fontSize: "medium"
+        visible: model.eventCount > 1
+        // TRANSLATORS: this is the count of events grouped into this single item
+        text: i18n.tr("(%1)").arg(model.eventCount)
+    }
+
     Label {
         id: phoneLabel
         anchors {
-            bottom: parent.bottom
+            top: titleLabel.bottom
+            topMargin: units.gu(1)
             left: avatar.right
             leftMargin: units.gu(2)
         }
         height: units.gu(2)
-        verticalAlignment: Text.AlignVCenter
+        verticalAlignment: Text.AlignTop
         fontSize: "small"
         // FIXME: handle conference call
         text: phoneNumberSubTypeLabel
@@ -200,22 +228,25 @@
         id: time
         anchors {
             right: parent.right
-            verticalCenter: titleLabel.verticalCenter
+            bottom: titleLabel.bottom
         }
         height: units.gu(2)
-        verticalAlignment: Text.AlignVCenter
+        verticalAlignment: Text.AlignBottom
         fontSize: "small"
-        text: Qt.formatTime(model.timestamp, "hh:mm")
+        // TRANSLATORS: this string is the time a call has happenend. It represents the format to be used, according to:
+        // http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
+        // please change according to your language
+        text: Qt.formatTime(model.timestamp, i18n.tr("hh:mm ap"))
     }
 
     Label {
         id: callType
         anchors {
             right: parent.right
-            verticalCenter: phoneLabel.verticalCenter
+            bottom: phoneLabel.bottom
         }
         height: units.gu(2)
-        verticalAlignment: Text.AlignVCenter
+        verticalAlignment: Text.AlignBottom
         fontSize: "small"
         text: selectCallType()
     }

=== added file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	1970-01-01 00:00:00 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2014-08-22 15:27:37 +0000
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This file is part of dialer-app.
+ *
+ * dialer-app 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.
+ *
+ * dialer-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.0
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Telephony 0.1
+import Ubuntu.Telephony.PhoneNumber 0.1 as PhoneUtils
+import Ubuntu.Contacts 0.1
+import QtContacts 5.0
+import "dateUtils.js" as DateUtils
+
+Page {
+    id: historyDetailsPage
+
+    property alias phoneNumber: contactWatcher.phoneNumber
+    property string phoneNumberSubTypeLabel
+    property variant events: null
+    property QtObject eventModel: null
+    readonly property bool unknownContact: contactWatcher.contactId === ""
+    property bool knownNumber: phoneNumber != "x-ofono-private" && phoneNumber != "x-ofono-unknown"
+
+    objectName: "historyDetailsPage"
+    anchors.fill: parent
+    title: {
+        if (contactWatcher.phoneNumber == "x-ofono-private") {
+            return i18n.tr("Private number")
+        } else if (contactWatcher.phoneNumber == "x-ofono-unknown") {
+            return i18n.tr("Unknown number")
+        } else if (contactWatcher.alias != "") {
+            return contactWatcher.alias
+        }
+        return PhoneUtils.PhoneUtils.format(contactWatcher.phoneNumber)
+    }
+
+    head.actions: [
+        Action {
+            iconName: unknownContact ? "contact-new" : "stock_contact"
+            text: i18n.tr("Contact Details")
+            visible: knownNumber
+            onTriggered: {
+                if (unknownContact) {
+                    mainView.addNewPhone(phoneNumber)
+                } else {
+                    mainView.viewContact(contactWatcher.contactId)
+                }
+            }
+        },
+        Action {
+            iconName: "share"
+            text: i18n.tr("Share")
+            onTriggered: {
+                // FIXME: implement
+            }
+            visible: false
+        },
+        Action {
+            iconName: "delete"
+            text: i18n.tr("Delete")
+            onTriggered: {
+                for (var i in events) {
+                    eventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type);
+                }
+                pageStack.pop();
+            }
+        }
+
+    ]
+
+    Item {
+        id: helper
+
+        function updateSubTypeLabel() {
+            var subLabel = contactWatcher.isUnknown
+            if (phoneNumber) {
+                var typeInfo = phoneTypeModel.get(phoneTypeModel.getTypeIndex(phoneDetail))
+                if (typeInfo) {
+                    subLabel = typeInfo.label
+                }
+            }
+            phoneNumberSubTypeLabel = subLabel
+        }
+
+        Component.onCompleted: updateSubTypeLabel()
+
+        ContactWatcher {
+            id: contactWatcher
+            // FIXME: handle conf calls
+            onPhoneNumberContextsChanged: helper.updateSubTypeLabel()
+            onPhoneNumberSubTypesChanged: helper.updateSubTypeLabel()
+            onIsUnknownChanged: helper.updateSubTypeLabel()
+        }
+
+        PhoneNumber {
+            id: phoneDetail
+            contexts: contactWatcher.phoneNumberContexts
+            subTypes: contactWatcher.phoneNumberSubTypes
+        }
+
+        ContactDetailPhoneNumberTypeModel {
+            id: phoneTypeModel
+            Component.onCompleted: helper.updateSubTypeLabel()
+        }
+    }
+
+    Rectangle {
+        anchors.fill: parent
+        color: Theme.palette.normal.background
+    }
+
+    ListView {
+        id: eventsView
+        anchors.fill: parent
+        model: events
+        header: Item {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            height: units.gu(12)
+
+            Label {
+                id: phoneLabel
+                anchors {
+                    top: parent.top
+                    topMargin: units.gu(2)
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                }
+                verticalAlignment: Text.AlignTop
+                fontSize: "medium"
+                text: PhoneUtils.PhoneUtils.format(contactWatcher.phoneNumber)
+                elide: Text.ElideRight
+                color: UbuntuColors.lightAubergine
+                height: units.gu(2)
+            }
+
+            Label {
+                id: phoneTypeLabel
+                anchors {
+                    top: phoneLabel.bottom
+                    left: phoneLabel.left
+                }
+                text: historyDetailsPage.phoneNumberSubTypeLabel
+                height: units.gu(2)
+                verticalAlignment: Text.AlignVCenter
+                fontSize: "small"
+                visible: contactWatcher.interactive && !contactWatcher.isUnknown // non-interactive entries are calls from unknown or private numbers
+            }
+
+            Label {
+                id: dateLabel
+                anchors {
+                    left: phoneLabel.left
+                    top: phoneTypeLabel.bottom
+                    topMargin: units.gu(2)
+                }
+                text: DateUtils.friendlyDay(historyDetailsPage.events[0].date)
+                height: units.gu(3)
+                fontSize: "medium"
+                font.weight: Font.DemiBold
+                verticalAlignment: Text.AlignVCenter
+            }
+
+            ListItem.ThinDivider {
+                id: divider
+                anchors {
+                    top: dateLabel.bottom
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
+            }
+
+            AbstractButton {
+                id: messageButton
+                anchors {
+                    top: parent.top
+                    topMargin: units.gu(1)
+                    right: parent.right
+                }
+                width: units.gu(4)
+                height: units.gu(4)
+                visible: knownNumber
+                enabled: knownNumber
+
+                Icon {
+                    name: "message"
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    anchors.centerIn: parent
+                }
+
+                onClicked: mainView.sendMessage(phoneNumber)
+            }
+
+            AbstractButton {
+                id: callButton
+                anchors {
+                    top: messageButton.top
+                    right: messageButton.left
+                }
+                width: units.gu(4)
+                height: units.gu(4)
+                visible: knownNumber
+                Icon {
+                    name: "call-start"
+                    width: units.gu(2)
+                    height: units.gu(2)
+                    anchors.centerIn: parent
+                }
+                onClicked: {
+                    if (mainView.account) {
+                        mainView.call(phoneNumber, mainView.account.accountId);
+                    } else {
+                        mainView.populateDialpad(phoneNumber, mainView.account ? mainView.account.accountId : "");
+                    }
+                }
+            }
+        }
+
+        delegate: ListItemWithActions {
+            readonly property bool incoming: modelData.senderId !== "self"
+            height: units.gu(5)
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            leftSideAction: Action {
+                iconName: "delete"
+                text: i18n.tr("Delete")
+                onTriggered:  {
+                    // remove from the history service
+                    eventModel.removeEvent(modelData.accountId, modelData.threadId, modelData.eventId, modelData.type)
+
+                    // as this page only displays an array of events, we need to update manually
+                    // the list of displayed events
+                    var updatedEvents = historyDetailsPage.events;
+                    updatedEvents.splice(index, 1);
+                    historyDetailsPage.events = updatedEvents;
+                }
+            }
+
+            Label {
+                id: timeLabel
+                // TRANSLATORS: HH:mm is the time format, translate it according to:
+                // http://qt-project.org/doc/qt-5/qml-qtqml-qt.html#formatDate-method
+                text: Qt.formatTime(modelData.timestamp, i18n.tr("hh:mm ap"))
+                anchors {
+                    left: parent.left
+                    verticalCenter: parent.verticalCenter
+                }
+                color: UbuntuColors.lightAubergine
+                verticalAlignment: Qt.AlignVCenter
+            }
+
+            Label {
+                id: simLabel
+                anchors {
+                    left: timeLabel.right
+                    leftMargin: units.gu(1)
+                    verticalCenter: timeLabel.verticalCenter
+                }
+
+                height: units.gu(2)
+                fontSize: "x-small"
+                text: telepathyHelper.accountForId(modelData.accountId).displayName
+                verticalAlignment: Text.AlignVCenter
+                visible: telepathyHelper.activeAccounts.length > 1
+            }
+
+            Label {
+                id: durationLabel
+                text: DateUtils.formatCallDuration(modelData.duration)
+                anchors {
+                    right: parent.right
+                    top: parent.top
+                    topMargin: units.gu(-0.5)
+                }
+                verticalAlignment: Text.AlignTop
+                visible: !modelData.missed
+                fontSize: "small"
+                height: units.gu(2)
+            }
+
+            Label {
+                id: typeLabel
+                text: {
+                    if (modelData.missed) {
+                        return i18n.tr("Missed");
+                    } else if (incoming) {
+                        return i18n.tr("Incoming");
+                    } else {
+                        return i18n.tr("Outgoing");
+                    }
+                }
+                anchors {
+                    right: parent.right
+                    bottom: parent.bottom
+                    bottomMargin: units.gu(-0.5)
+                }
+                verticalAlignment: Text.AlignBottom
+                fontSize: "x-small"
+            }
+        }
+    }
+
+}

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2014-07-31 12:35:17 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2014-08-22 15:27:37 +0000
@@ -30,7 +30,7 @@
 
     property string searchTerm
     property int delegateHeight: delegate.height
-    property bool fullView: false
+    property bool fullView: currentIndex == -1
     property alias currentIndex: historyList.currentIndex
     property alias selectionMode: historyList.isInSelectionMode
 
@@ -114,8 +114,9 @@
         }
     }
 
-    HistoryEventModel {
+    HistoryGroupedEventsModel {
         id: historyEventModel
+        groupingProperties: ["participants", "date"]
         type: HistoryThreadModel.EventTypeVoice
         sort: HistorySort {
             sortField: "timestamp"
@@ -124,13 +125,6 @@
         filter: HistoryFilter {}
     }
 
-    SortProxyModel {
-        id: sortProxy
-        sortRole: HistoryEventModel.TimestampRole
-        sourceModel: historyEventModel
-        ascending: false
-    }
-
     MultipleSelectionListView {
         id: historyList
         objectName: "historyList"
@@ -174,7 +168,7 @@
 
         currentIndex: -1
         anchors.fill: parent
-        listModel: sortProxy
+        listModel: historyEventModel
 
         onSelectionDone: {
             for (var i=0; i < items.count; i++) {
@@ -189,6 +183,34 @@
             }
         }
 
+        Component {
+            id: sectionComponent
+            Label {
+                anchors {
+                    left: parent.left
+                    leftMargin: units.gu(2)
+                    right: parent.right
+                    rightMargin: units.gu(2)
+                }
+                text: DateUtils.friendlyDay(section)
+                height: units.gu(5)
+                fontSize: "medium"
+                font.weight: Font.DemiBold
+                verticalAlignment: Text.AlignVCenter
+                ListItem.ThinDivider {
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        bottom: parent.bottom
+                        bottomMargin: units.gu(0.5)
+                    }
+                }
+            }
+        }
+
+        section.property: "date"
+        section.delegate: fullView ? sectionComponent : null
+
         listDelegate: delegateComponent
 
         Component {
@@ -269,14 +291,28 @@
                 leftSideAction: Action {
                     iconName: "delete"
                     text: i18n.tr("Delete")
-                    onTriggered:  historyEventModel.removeEvent(model.accountId, model.threadId, model.eventId, model.type)
+                    onTriggered:  {
+                        var events = model.events;
+                        for (var i in events) {
+                            historyEventModel.removeEvent(events[i].accountId, events[i].threadId, events[i].eventId, events[i].type)
+                        }
+                    }
                 }
                 property bool knownNumber: participants[0] != "x-ofono-private" && participants[0] != "x-ofono-unknown"
                 rightSideActions: [
-                    // FIXME: the first action should go to contac call log details page
+                    Action {
+                        iconName: "info"
+                        text: i18n.tr("Details")
+                        onTriggered: {
+                            pageStack.push(Qt.resolvedUrl("HistoryDetailsPage.qml"),
+                                                          { phoneNumber: participants[0],
+                                                            events: model.events,
+                                                            eventModel: historyEventModel})
+                        }
+                    },
                     Action {
                         iconName: unknownContact ? "contact-new" : "stock_contact"
-                        text: i18n.tr("Details")
+                        text: i18n.tr("Contact Details")
                         onTriggered: {
                             if (unknownContact) {
                                 mainView.addNewPhone(phoneNumber)

=== removed file 'src/qml/HistoryPage/Timeline.qml'
--- src/qml/HistoryPage/Timeline.qml	2014-07-23 10:13:32 +0000
+++ src/qml/HistoryPage/Timeline.qml	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright 2012-2013 Canonical Ltd.
- *
- * This file is part of dialer-app.
- *
- * dialer-app 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.
- *
- * dialer-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.0
-import Ubuntu.Components 1.1
-
-Item {
-    property bool isFirst: false
-    property alias mainAreaHeight: mainArea.height
-
-    width: units.gu(2)
-    height: units.gu(9)
-
-    Item {
-        id: mainArea
-        anchors {
-            left: parent.left
-            right: parent.right
-            top: parent.top
-        }
-        height: units.gu(9)
-    }
-
-    BorderImage {
-        id: topLine
-        visible: !isFirst
-        anchors.top: parent.top
-        anchors.bottom: circle.top
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "../assets/timeline_vertical_line.sci"
-        smooth: true
-    }
-
-    Image {
-        id: circle
-        anchors.verticalCenter: mainArea.verticalCenter
-        anchors.horizontalCenter: parent.horizontalCenter
-        source: "../assets/timeline_circle.png"
-        smooth: true
-    }
-
-    BorderImage {
-        id: bottomLine
-        anchors.top: circle.bottom
-        anchors.bottom: parent.bottom
-        anchors.horizontalCenter: mainArea.horizontalCenter
-        source: "../assets/timeline_vertical_line.sci"
-        smooth: true
-    }
-}

=== modified file 'src/qml/HistoryPage/dateUtils.js'
--- src/qml/HistoryPage/dateUtils.js	2014-01-24 20:38:22 +0000
+++ src/qml/HistoryPage/dateUtils.js	2014-08-22 15:27:37 +0000
@@ -33,7 +33,11 @@
 }
 
 function friendlyDay(timestamp) {
-    var date = new Date(timestamp);
+    var year = Qt.formatDate(timestamp, "yyyy");
+    var month = Qt.formatDate(timestamp, "MM");
+    var day = Qt.formatDate(timestamp, "dd");
+    // NOTE: it is very weird, but javascript Date() object expects months to be between 0 and 11
+    var date = new Date(year, month-1, day);
     var today = new Date();
     var yesterday = new Date();
     yesterday.setDate(today.getDate()-1);
@@ -50,12 +54,39 @@
     return Qt.formatTime(timestamp, Qt.DefaultLocaleShortDate) + " - " + friendlyDay(timestamp);
 }
 
+function dateFromDuration(duration) {
+    var durationTime = new Date();
+    var processedDuration = duration;
+    var seconds = processedDuration % 60;
+    var minutes = 0;
+    var hours = 0;
+
+
+    // divide by 60 to get the minutes
+    processedDuration = Math.floor(processedDuration / 60);
+    if (processedDuration > 0) {
+        minutes = processedDuration % 60;
+
+        // divide again to get the hours
+        processedDuration = Math.floor(processedDuration / 60);
+        hours = processedDuration;
+    }
+
+    durationTime.setHours(hours);
+    durationTime.setMinutes(minutes);
+    durationTime.setSeconds(seconds);
+
+    return durationTime;
+}
+
 function formatFriendlyCallDuration(duration) {
     var text = "";
 
-    var hours = parseInt(Qt.formatTime(duration, "hh"));
-    var minutes = parseInt(Qt.formatTime(duration, "mm"));
-    var seconds = parseInt(Qt.formatTime(duration, "ss"));
+    var durationTime = dateFromDuration(duration);
+
+    var hours = parseInt(Qt.formatTime(durationTime, "hh"));
+    var minutes = parseInt(Qt.formatTime(durationTime, "mm"));
+    var seconds = parseInt(Qt.formatTime(durationTime, "ss"));
 
     if (hours > 0) {
         text = i18n.tr("%1 hour", "%1 hours", hours).arg(hours)
@@ -67,3 +98,21 @@
 
     return text;
 }
+
+function formatCallDuration(duration) {
+    var text = ""
+    var durationTime = dateFromDuration(duration);
+
+    var hours = parseInt(Qt.formatTime(durationTime, "hh"));
+    var minutes = parseInt(Qt.formatTime(durationTime, "mm"));
+    var seconds = parseInt(Qt.formatTime(durationTime, "ss"));
+
+    if (hours > 0) {
+        // TRANSLATORS: this is the duration time format when the call lasted more than an hour
+        text = Qt.formatTime(durationTime, i18n.tr("hh:mm:ss"));
+    } else {
+        // TRANSLATORS: this is the duration time format when the call lasted less than an hour
+        text = Qt.formatTime(durationTime, i18n.tr("mm:ss"));
+    }
+    return text;
+}

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2014-07-31 08:22:43 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2014-08-22 15:27:37 +0000
@@ -70,6 +70,7 @@
 
     title: caller
     head.actions: greeter.greeterActive ? greeterModeActions : regularActions
+    head.sections.model: multipleAccounts ? [call.account.displayName] : []
     x: header ? header.height : 0
 
     // if there are no calls, just reset the view

=== modified file 'src/qml/assets/[e-mail]'
Binary files src/qml/assets/[e-mail]	2014-05-21 08:40:25 +0000 and src/qml/assets/[e-mail]	2014-08-22 15:27:37 +0000 differ
=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2014-08-13 22:27:59 +0000
+++ src/qml/dialer-app.qml	2014-08-22 15:27:37 +0000
@@ -30,14 +30,16 @@
     property bool applicationActive: Qt.application.active
     property string ussdResponseTitle: ""
     property string ussdResponseText: ""
-    property bool multipleAccounts: telepathyHelper.accounts.length > 1
-    property QtObject account: {
+    property bool multipleAccounts: telepathyHelper.activeAccounts.length > 1
+    property QtObject account: defaultAccount()
+
+    function defaultAccount() {
         // we only use the default account property if we have more
         // than one account, otherwise we use always the first one
         if (multipleAccounts) {
             return telepathyHelper.defaultCallAccount
         } else {
-            return telepathyHelper.accounts[0]
+            return telepathyHelper.activeAccounts[0]
         }
     }
 
@@ -72,6 +74,20 @@
         }
     }
 
+    Connections {
+        target: telepathyHelper
+        onActiveAccountsChanged: {
+            // check if the selected account is not active anymore
+            for (var i in telepathyHelper.activeAccounts) {
+                if (telepathyHelper.activeAccounts[i] == account) {
+                    return;
+                }
+            }
+            account = Qt.binding(defaultAccount)
+        }
+        onDefaultCallAccountChanged: account = Qt.binding(defaultAccount)
+    }
+
     Settings {
         id: settings
         category: "DualSim"
@@ -256,6 +272,7 @@
         }
 
         source: Qt.resolvedUrl("assets/dialer_background_full.png")
+        asynchronous: true
     }
 
     Component {

=== modified file 'tests/autopilot/dialer_app/tests/test_logs.py'
--- tests/autopilot/dialer_app/tests/test_logs.py	2014-08-10 07:55:47 +0000
+++ tests/autopilot/dialer_app/tests/test_logs.py	2014-08-22 15:27:37 +0000
@@ -59,7 +59,7 @@
         """
         delegate = self.main_view.wait_select_single(
             ListItemWithActions.HistoryDelegate, objectName='historyDelegate0')
-        delegate.active_action(2)
+        delegate.active_action(3)
         self.addCleanup(subprocess.call, ['pkill', '-f', 'messaging-app'])
 
         msg_app = self._get_app_proxy_object('messaging-app')
@@ -78,7 +78,7 @@
         """
         delegate = self.main_view.wait_select_single(
             ListItemWithActions.HistoryDelegate, objectName='historyDelegate0')
-        delegate.active_action(1)
+        delegate.active_action(2)
         self.addCleanup(subprocess.call, ['pkill', '-f', 'address-book-app'])
 
         cntct_app = self._get_app_proxy_object('address-book-app')