Merge lp:dialer-app/staging into lp:dialer-app

[Gustavo Pichorim Boiko]

- Adapt to work with VOIP accounts.
- Install 'IM' account application file. Make sure that dialer-app appear on the application list for 'IM' services.
- Allow to expand the keypad.
- Move the phone settings from ubuntu-system-settings to dialer-app.

- Adapt to work with VOIP accounts.
- Install 'IM' account application file. Make sure that dialer-app appear on the application list for 'IM' services.
- Allow to expand the keypad.
- Move the phone settings from ubuntu-system-settings to dialer-app.

[lp:dialer-app/staging]

559. By Gustavo Pichorim Boiko on 2017-03-22

Move the phone settings from ubuntu-system-settings to dialer-app.

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:559
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2339
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2338
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2160/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2160/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2160/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2160/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2160/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2160
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2160/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-dialer-app-ci/2/rebuild

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

The changes were reviewed individually and tested from this branch, so approving.

review: Approve

[lp:dialer-app/staging]

560. By Tiago Salem Herrmann on 2017-03-27

Use HistoryUnionFilter to force history model query the server

561. By Gustavo Pichorim Boiko on 2017-04-05

Only try to assing previously set values if they are available.

562. By Gustavo Pichorim Boiko on 2017-04-05

Avoid placing multiple calls when pressing enter by removing the focus of the view

Unmerged revisions

562. By Gustavo Pichorim Boiko on 2017-04-05

Avoid placing multiple calls when pressing enter by removing the focus of the view

561. By Gustavo Pichorim Boiko on 2017-04-05

Only try to assing previously set values if they are available.

560. By Tiago Salem Herrmann on 2017-03-27

Use HistoryUnionFilter to force history model query the server

559. By Gustavo Pichorim Boiko on 2017-03-22

Move the phone settings from ubuntu-system-settings to dialer-app.

558. By Gustavo Pichorim Boiko on 2017-03-22

Allow to expand the keypad.

557. By Gustavo Pichorim Boiko on 2017-03-22

Install 'IM' account application file.

Make sure that dialer-app appear on the application list for 'IM' services.

556. By Gustavo Pichorim Boiko on 2017-03-22

Adapt to work with VOIP accounts.

555. By Gustavo Pichorim Boiko on 2017-03-22

Sync with trunk.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-08-15 09:08:45 +0000
+++ CMakeLists.txt	2017-04-05 17:09:12 +0000
@@ -73,4 +73,5 @@
 
 add_subdirectory(po)
 add_subdirectory(src)
+add_subdirectory(accounts)
 add_subdirectory(tests)

=== added file 'TODO'
--- TODO	1970-01-01 00:00:00 +0000
+++ TODO	2017-04-05 17:09:12 +0000
@@ -0,0 +1,1 @@
+- port the settings page to use the new SDK ListItem to fix keyboard navigation

=== added directory 'accounts'
=== added file 'accounts/CMakeLists.txt'
--- accounts/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ accounts/CMakeLists.txt	2017-04-05 17:09:12 +0000
@@ -0,0 +1,2 @@
+file(GLOB APPLICATION_FILES *.application)
+install(FILES ${APPLICATION_FILES} DESTINATION share/accounts/applications/)

=== added file 'accounts/dialer-app.application'
--- accounts/dialer-app.application	1970-01-01 00:00:00 +0000
+++ accounts/dialer-app.application	2017-04-05 17:09:12 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application id="dialer-app">
+  <description>Dialer</description>
+  <desktop-entry>dialer-app.desktop</desktop-entry>
+  <translations>dialer</translations>
+
+  <services>
+    <service id="telephony-sip-im">
+      <description>Allow SIP calls from dialer app</description>
+    </service>
+  </services>
+</application>

=== modified file 'debian/dialer-app.install'
--- debian/dialer-app.install	2015-04-30 18:10:29 +0000
+++ debian/dialer-app.install	2017-04-05 17:09:12 +0000
@@ -8,7 +8,9 @@
 usr/share/dialer-app/ContactsPage
 usr/share/dialer-app/ContactViewPage
 usr/share/dialer-app/ContactEditorPage
+usr/share/dialer-app/SettingsPage
 usr/share/dialer-app/Dialogs
 usr/share/dialer-app/assets
 usr/share/dialer-app/MMI
+usr/share/accounts/applications/*
 usr/bin/*dialer-app*

=== modified file 'po/dialer-app.pot'
--- po/dialer-app.pot	2015-07-15 13:54:05 +0000
+++ po/dialer-app.pot	2017-04-05 17:09:12 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-15 10:53-0300\n"
+"POT-Creation-Date: 2017-01-12 16:58-0200\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,17 +18,25 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../src/qml/DialerPage/Keypad.qml:174
+#: ../src/qml/DialerPage/Keypad.qml:242
 msgid "#"
 msgstr ""
 
 #. TRANSLATORS: %1 is the call duration here.
-#: ../src/qml/LiveCallPage/LiveCall.qml:443
+#: ../src/qml/LiveCallPage/LiveCall.qml:454
 #, qt-format
 msgid "%1 - on hold"
 msgstr ""
 
+#. TRANSLATORS: %1 is the name of the (network) carrier
+#: ../src/qml/SettingsPage/Services.qml:34
+#: ../src/qml/SettingsPage/SingleSim.qml:51
+#, qt-format
+msgid "%1 Services"
+msgstr ""
+
 #: ../src/qml/HistoryPage/dateUtils.js:92
+#: ../src/qml/SettingsPage/dateUtils.js:61
 #, qt-format
 msgid "%1 hour"
 msgid_plural "%1 hours"
@@ -36,6 +44,7 @@
 msgstr[1] ""
 
 #: ../src/qml/HistoryPage/dateUtils.js:94
+#: ../src/qml/SettingsPage/dateUtils.js:63
 #, qt-format
 msgid "%1 min"
 msgid_plural "%1 mins"
@@ -43,6 +52,7 @@
 msgstr[1] ""
 
 #: ../src/qml/HistoryPage/dateUtils.js:96
+#: ../src/qml/SettingsPage/dateUtils.js:65
 #, qt-format
 msgid "%1 sec"
 msgid_plural "%1 secs"
@@ -50,61 +60,62 @@
 msgstr[1] ""
 
 #. TRANSLATORS: this is the count of events grouped into this single item
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:201
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:206
 #: ../src/qml/HistoryPage/SwipeItemDemo.qml:150
 #, qt-format
 msgid "(%1)"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:150
+#: ../src/qml/DialerPage/Keypad.qml:206
 msgid "*"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:161
+#: ../src/qml/DialerPage/DialerBottomEdge.qml:26
+#: ../src/qml/DialerPage/Keypad.qml:223
 msgid "+"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:160
+#: ../src/qml/DialerPage/Keypad.qml:222
 msgid "0"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:49
+#: ../src/qml/DialerPage/Keypad.qml:51
 msgid "1"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:60
+#: ../src/qml/DialerPage/Keypad.qml:68
 msgid "2"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:71
+#: ../src/qml/DialerPage/Keypad.qml:85
 msgid "3"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:82
+#: ../src/qml/DialerPage/Keypad.qml:102
 msgid "4"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:93
+#: ../src/qml/DialerPage/Keypad.qml:119
 msgid "5"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:104
+#: ../src/qml/DialerPage/Keypad.qml:136
 msgid "6"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:115
+#: ../src/qml/DialerPage/Keypad.qml:153
 msgid "7"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:126
+#: ../src/qml/DialerPage/Keypad.qml:170
 msgid "8"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:137
+#: ../src/qml/DialerPage/Keypad.qml:187
 msgid "9"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:61
+#: ../src/qml/DialerPage/Keypad.qml:69
 msgid "ABC"
 msgstr ""
 
@@ -112,61 +123,94 @@
 msgid "Active"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryPage.qml:49
+#: ../src/qml/HistoryPage/HistoryPage.qml:68
 msgctxt "All Calls"
 msgid "All"
 msgstr ""
 
-#: ../src/qml/ContactsPage/ContactsPage.qml:92
+#: ../src/qml/ContactsPage/ContactsPage.qml:95
 msgctxt "All Contacts"
 msgid "All"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:326
+#: ../src/qml/SettingsPage/CallForwarding.qml:378
+msgid "All calls"
+msgstr ""
+
+#: ../src/qml/LiveCallPage/LiveCall.qml:341
 msgid "Bluetooth device"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:596
+#: ../src/qml/SettingsPage/ServiceInfo.qml:125
+msgid "Call"
+msgstr ""
+
+#: ../src/qml/dialer-app.qml:570
 msgid "Call Barring"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:607
+#: ../src/qml/dialer-app.qml:581
 msgid "Call Forwarding"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:618
+#: ../src/qml/dialer-app.qml:592
 msgid "Call Waiting"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:134
+#: ../src/qml/LiveCallPage/LiveCall.qml:152
 msgid "Call ended"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:283
+#: ../src/qml/LiveCallPage/LiveCall.qml:297
 msgid "Call failed"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:142
+#: ../src/qml/SettingsPage/CallForwarding.qml:44
+#: ../src/qml/SettingsPage/MultiSim.qml:51
+#: ../src/qml/SettingsPage/NoSims.qml:28
+#: ../src/qml/SettingsPage/SingleSim.qml:39
+msgid "Call forwarding"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwardItem.qml:218
+msgid "Call forwarding can't be changed right now."
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:154
+msgid "Call forwarding status can't be checked "
+msgstr ""
+
+#: ../src/qml/LiveCallPage/LiveCall.qml:160
 msgid "Call holding failure"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:110
-#: ../src/qml/LiveCallPage/LiveCall.qml:445
+#: ../src/qml/SettingsPage/CallWaiting.qml:31
+#: ../src/qml/SettingsPage/CallWaiting.qml:86
+#: ../src/qml/SettingsPage/MultiSim.qml:41
+#: ../src/qml/SettingsPage/NoSims.qml:34
+#: ../src/qml/SettingsPage/SingleSim.qml:32
+msgid "Call waiting"
+msgstr ""
+
+#: ../src/qml/DialerPage/DialerPage.qml:509
+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:113
+#: ../src/qml/LiveCallPage/LiveCall.qml:456
 #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:108
 msgid "Calling"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:629
+#: ../src/qml/dialer-app.qml:603
 msgid "Calling Line Presentation"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:641
+#: ../src/qml/dialer-app.qml:615
 msgid "Calling Line Restriction"
 msgstr ""
 
 #: ../src/qml/ContactEditorPage/DialerContactEditorPage.qml:35
-#: ../src/qml/ContactsPage/ContactsPage.qml:106
+#: ../src/qml/ContactsPage/ContactsPage.qml:145
 #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:38
+#: ../src/qml/SettingsPage/CallForwarding.qml:236
 msgid "Cancel"
 msgstr ""
 
@@ -176,49 +220,61 @@
 msgid "Change all Call associations to %1?"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:55
+#: ../src/qml/DialerPage/DialerPage.qml:78
 #: ../src/qml/Dialogs/NotificationDialog.qml:29
 msgid "Close"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:48
+#: ../src/qml/LiveCallPage/LiveCall.qml:52
 #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:89
 msgid "Conference"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:113
+#: ../src/qml/LiveCallPage/LiveCall.qml:131
 msgid "Conference call failure"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:635
+#: ../src/qml/dialer-app.qml:609
 msgid "Connected Line Presentation"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:647
+#: ../src/qml/dialer-app.qml:621
 msgid "Connected Line Restriction"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:54
-#: ../src/qml/HistoryPage/HistoryPage.qml:343
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:66
+#: ../src/qml/HistoryPage/HistoryPage.qml:369
 msgid "Contact Details"
 msgstr ""
 
-#: ../src/qml/ContactsPage/ContactsPage.qml:53
-#: ../src/qml/DialerPage/DialerPage.qml:42
+#: ../src/qml/SettingsPage/CallForwarding.qml:299
+msgid "Contact not associated with any phone number."
+msgstr ""
+
+#: ../src/qml/ContactsPage/ContactsPage.qml:77
+#: ../src/qml/DialerPage/DialerPage.qml:59
 msgid "Contacts"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:72
+#: ../src/qml/SettingsPage/CallForwarding.qml:223
+msgid "Contacts..."
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:298
+msgid "Could not forward to this contact"
+msgstr ""
+
+#: ../src/qml/DialerPage/Keypad.qml:86
 msgid "DEF"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:74
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:238
-#: ../src/qml/HistoryPage/HistoryPage.qml:315
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:86
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:253
+#: ../src/qml/HistoryPage/HistoryPage.qml:341
 msgid "Delete"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryPage.qml:324
+#: ../src/qml/HistoryPage/HistoryPage.qml:350
 msgid "Details"
 msgstr ""
 
@@ -226,12 +282,13 @@
 msgid "Disable"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:451
+#: ../src/qml/Dialogs/FlightModeProgressDialog.qml:29
 msgid "Disabling flight mode"
 msgstr ""
 
-#: ../src/qml/MMI/IMEI.qml:48 ../src/qml/dialer-app.qml:514
-#: ../src/qml/dialer-app.qml:528
+#: ../src/qml/Dialogs/UssdErrorDialog.qml:31
+#: ../src/qml/Dialogs/UssdResponseDialog.qml:30
+#: ../src/qml/MMI/IMEIDialog.qml:40
 msgid "Dismiss"
 msgstr ""
 
@@ -239,47 +296,64 @@
 msgid "Don't ask again"
 msgstr ""
 
-#: ../src/qml/ContactViewPage/DialerContactViewPage.qml:69
+#: ../src/qml/ContactViewPage/DialerContactViewPage.qml:70
 msgid "Edit"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:72
+#: ../src/qml/DialerPage/DialerPage.qml:132
+#: ../src/qml/DialerPage/DialerPage.qml:142
 msgid "Emergency Calls"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:277
+#: ../src/qml/DialerPage/DialerPage.qml:467
+msgid "Emergency call"
+msgstr ""
+
+#: ../src/qml/DialerPage/DialerPage.qml:303
+#: ../src/qml/SettingsPage/CallForwardItem.qml:171
 msgid "Enter a number"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:511
+#: ../src/qml/Dialogs/UssdErrorDialog.qml:28
 msgid "Error"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:143
+#: ../src/qml/LiveCallPage/LiveCall.qml:161
 msgid "Failed to activate the call."
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:114
+#: ../src/qml/LiveCallPage/LiveCall.qml:132
 msgid "Failed to create a conference call."
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:144
+#: ../src/qml/LiveCallPage/LiveCall.qml:162
 msgid "Failed to place the active call on hold."
 msgstr ""
 
-#: ../src/qml/ContactsPage/ContactsPage.qml:92
+#: ../src/qml/ContactsPage/ContactsPage.qml:95
 msgid "Favorites"
 msgstr ""
 
+#: ../src/qml/DialerPage/DialerPage.qml:137
 #: ../src/qml/Dialogs/DisableFlightModeDialog.qml:27
 msgid "Flight Mode"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:77
-msgid "Flight mode"
-msgstr ""
-
-#: ../src/qml/DialerPage/Keypad.qml:83
+#: ../src/qml/SettingsPage/CallForwarding.qml:127
+msgid "Forward every incoming call"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:162
+msgid "Forward incoming calls when:"
+msgstr ""
+
+#. TRANSLATORS: This string will be truncated on smaller displays.
+#: ../src/qml/SettingsPage/CallForwardItem.qml:157
+#: ../src/qml/SettingsPage/CallForwardItem.qml:202
+msgid "Forward to"
+msgstr ""
+
+#: ../src/qml/DialerPage/Keypad.qml:103
 msgid "GHI"
 msgstr ""
 
@@ -287,43 +361,62 @@
 msgid "Got it"
 msgstr ""
 
-#: ../src/qml/MMI/IMEI.qml:36
+#: ../src/qml/SettingsPage/CallForwarding.qml:182
+msgid "I don't answer"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:171
+msgid "I'm on another call"
+msgstr ""
+
+#: ../src/qml/MMI/IMEIDialog.qml:27
 msgid "IMEI"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:64
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:315
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:65
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:330
 #: ../src/qml/HistoryPage/SwipeItemDemo.qml:189
 msgid "Incoming"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:512
+#: ../src/qml/DialerPage/DialerPage.qml:129
+msgid "Initializing..."
+msgstr ""
+
+#: ../src/qml/Dialogs/UssdErrorDialog.qml:29
 msgid "Invalid USSD code"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:94
+#: ../src/qml/DialerPage/Keypad.qml:120
 msgid "JKL"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:85
-msgid "Keypad"
+#: ../src/qml/SettingsPage/ServiceInfo.qml:115
+#, qt-format
+msgid "Last called %1"
 msgstr ""
 
 #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:80
 msgid "Later"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:105
+#: ../src/qml/SettingsPage/CallWaiting.qml:101
+msgid ""
+"Lets you answer or start a new call while on another call, and switch "
+"between them"
+msgstr ""
+
+#: ../src/qml/DialerPage/Keypad.qml:137
 msgid "MNO"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:548
+#: ../src/qml/LiveCallPage/LiveCall.qml:573
 msgid "Merge calls"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:62
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:313
-#: ../src/qml/HistoryPage/HistoryPage.qml:49
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:63
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:328
+#: ../src/qml/HistoryPage/HistoryPage.qml:68
 msgid "Missed"
 msgstr ""
 
@@ -331,29 +424,45 @@
 msgid "Mobile"
 msgstr ""
 
+#: ../src/qml/SettingsPage/CallForwarding.qml:193
+msgid "My phone is unreachable"
+msgstr ""
+
 #: ../src/qml/Dialogs/NoDefaultSIMCardDialog.qml:70
 #: ../src/qml/Dialogs/SetDefaultSIMCardDialog.qml:40
 msgid "No"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:316
+#: ../src/qml/dialer-app.qml:355
 msgid "No SIM card selected"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:104
+#: ../src/qml/LiveCallPage/LiveCall.qml:122
 msgid "No calls"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:87 ../src/qml/dialer-app.qml:337
-#: ../src/qml/dialer-app.qml:342
+#: ../src/qml/DialerPage/DialerPage.qml:151 ../src/qml/dialer-app.qml:374
+#: ../src/qml/dialer-app.qml:379
 msgid "No network"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryPage.qml:219
+#: ../src/qml/HistoryPage/HistoryPage.qml:245
 msgid "No recent calls"
 msgstr ""
 
-#: ../src/qml/Dialogs/SimLockedDialog.qml:49
+#: ../src/qml/SettingsPage/CallForwarding.qml:279
+msgid "Numbers"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:301
+msgid "OK"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:382
+msgid "Off"
+msgstr ""
+
+#: ../src/qml/Dialogs/SimLockedDialog.qml:50
 msgid "Ok"
 msgstr ""
 
@@ -361,15 +470,17 @@
 msgid "On hold"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:66
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:317
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:67
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:332
 msgid "Outgoing"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:116
+#: ../src/qml/DialerPage/Keypad.qml:154
 msgid "PQRS"
 msgstr ""
 
+#: ../src/qml/DialerPage/DialerPage.qml:149
+#: ../src/qml/SettingsPage/SettingsPage.qml:29
 #: ../src/dialer-app.desktop.in.in.h:1
 msgid "Phone"
 msgstr ""
@@ -378,7 +489,7 @@
 msgid "Phone App"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:330
+#: ../src/qml/LiveCallPage/LiveCall.qml:345
 msgid "Phone Speaker"
 msgstr ""
 
@@ -390,36 +501,48 @@
 msgid "Phone;Dialer;Dial;Call;Keypad"
 msgstr ""
 
-#: ../src/qml/Dialogs/SimLockedDialog.qml:37
+#: ../src/qml/SettingsPage/CallForwarding.qml:270
+msgid "Please select a phone number"
+msgstr ""
+
+#: ../src/qml/Dialogs/SimLockedDialog.qml:38
 msgid ""
 "Please unlock your SIM card to call or send a message. You can unlock your "
 "SIM card from the Network Indicator at the top of the screen or by visiting "
 "<a href=\"system_settings\">System Settings &gt; Security &amp; Privacy</a>."
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:491
+#: ../src/qml/Dialogs/UssdProgressDialog.qml:28
 msgid "Please wait"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:138
+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:141
 msgid "Private"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:167
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:42
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:168
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:43
 msgid "Private number"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:122
-#: ../src/qml/HistoryPage/HistoryPage.qml:45
+#: ../src/qml/DialerPage/DialerPage.qml:522
+#: ../src/qml/HistoryPage/HistoryPage.qml:47
 msgid "Recent"
 msgstr ""
 
-#: ../src/qml/Dialogs/SimLockedDialog.qml:26
+#: ../src/qml/SettingsPage/CallForwarding.qml:142
+msgid "Redirects all phone calls to another number."
+msgstr ""
+
+#: ../src/qml/SettingsPage/SingleSim.qml:28
+msgid "SIM"
+msgstr ""
+
+#: ../src/qml/Dialogs/SimLockedDialog.qml:27
 msgid "SIM Card is locked"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:79
+#: ../src/qml/DialerPage/DialerPage.qml:140
 msgid "SIM Locked"
 msgstr ""
 
@@ -427,15 +550,15 @@
 msgid "Save"
 msgstr ""
 
-#: ../src/qml/ContactsPage/ContactsPage.qml:80
+#: ../src/qml/ContactsPage/ContactsPage.qml:119
 msgid "Search"
 msgstr ""
 
-#: ../src/qml/ContactsPage/ContactsPage.qml:68
+#: ../src/qml/ContactsPage/ContactsPage.qml:67
 msgid "Search..."
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryPage.qml:45
+#: ../src/qml/HistoryPage/HistoryPage.qml:47
 msgid "Select"
 msgstr ""
 
@@ -445,19 +568,32 @@
 "choice in <a href=\"system_settings\">System Settings</a>."
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryPage.qml:334
+#: ../src/qml/HistoryPage/HistoryPage.qml:360
 msgid "Send message"
 msgstr ""
 
-#: ../src/qml/DialerPage/DialerPage.qml:47
+#: ../src/qml/SettingsPage/MultiSim.qml:62
+#: ../src/qml/SettingsPage/NoSims.qml:42
+msgid "Services"
+msgstr ""
+
+#: ../src/qml/SettingsPage/CallForwarding.qml:249
+msgid "Set"
+msgstr ""
+
+#: ../src/qml/DialerPage/DialerPage.qml:64
 msgid "Settings"
 msgstr ""
 
-#: ../src/qml/ContactViewPage/DialerContactViewPage.qml:60
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:66
+#: ../src/qml/ContactViewPage/DialerContactViewPage.qml:61
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:78
 msgid "Share"
 msgstr ""
 
+#: ../src/qml/SettingsPage/CallForwarding.qml:380
+msgid "Some calls"
+msgstr ""
+
 #: ../src/qml/HistoryPage/SwipeItemDemo.qml:326
 msgid "Swipe to delete"
 msgstr ""
@@ -466,11 +602,11 @@
 msgid "Swipe to reveal actions"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:159
+#: ../src/qml/LiveCallPage/LiveCall.qml:177
 msgid "Switch audio source:"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:533
+#: ../src/qml/LiveCallPage/LiveCall.qml:558
 msgid "Switch calls"
 msgstr ""
 
@@ -478,42 +614,47 @@
 msgid "Switch to default SIM:"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:127
+#: ../src/qml/DialerPage/Keypad.qml:171
 msgid "TUV"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:343
+#: ../src/qml/dialer-app.qml:380
 #, qt-format
 msgid "There is currently no network on %1"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:337 ../src/qml/dialer-app.qml:344
+#: ../src/qml/dialer-app.qml:374 ../src/qml/dialer-app.qml:381
 msgid "There is currently no network."
 msgstr ""
 
+#: ../src/qml/DialerPage/DialerPage.qml:467
+msgid "This is not an emergency number."
+msgstr ""
+
 #: ../src/qml/HistoryPage/dateUtils.js:45
+#: ../src/qml/SettingsPage/dateUtils.js:41
 msgid "Today"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:328
+#: ../src/qml/LiveCallPage/LiveCall.qml:343
 msgid "Ubuntu Phone"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/LiveCall.qml:332
+#: ../src/qml/LiveCallPage/LiveCall.qml:347
 msgid "Unknown device"
 msgstr ""
 
-#: ../src/qml/HistoryPage/HistoryDelegate.qml:169
-#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:44
+#: ../src/qml/HistoryPage/HistoryDelegate.qml:170
+#: ../src/qml/HistoryPage/HistoryDetailsPage.qml:45
 msgid "Unknown number"
 msgstr ""
 
-#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:72
+#: ../src/qml/LiveCallPage/ConferenceCallDisplay.qml:73
 #: ../src/qml/LiveCallPage/MultiCallDisplay.qml:91
 msgid "Voicemail"
 msgstr ""
 
-#: ../src/qml/DialerPage/Keypad.qml:138
+#: ../src/qml/DialerPage/Keypad.qml:188
 msgid "WXYZ"
 msgstr ""
 
@@ -522,6 +663,7 @@
 msgstr ""
 
 #: ../src/qml/HistoryPage/dateUtils.js:47
+#: ../src/qml/SettingsPage/dateUtils.js:43
 msgid "Yesterday"
 msgstr ""
 
@@ -529,7 +671,7 @@
 msgid "You have to disable flight mode in order to make calls"
 msgstr ""
 
-#: ../src/qml/dialer-app.qml:316
+#: ../src/qml/dialer-app.qml:355
 msgid "You need to select a SIM card"
 msgstr ""
 

=== modified file 'src/dialer-app.desktop.in.in'
--- src/dialer-app.desktop.in.in	2015-04-29 12:54:24 +0000
+++ src/dialer-app.desktop.in.in	2017-04-05 17:09:12 +0000
@@ -14,4 +14,3 @@
 X-Ubuntu-Default-Department-ID=accessories
 X-Ubuntu-Splash-Show-Header=true
 X-Screenshot=@CMAKE_INSTALL_PREFIX@/@DIALER_APP_DIR@/assets/dialer-app-screenshot.png
-X-Ubuntu-Supported-Orientations=portrait

=== modified file 'src/qml/AccountsModel.qml'
--- src/qml/AccountsModel.qml	2016-10-19 11:45:45 +0000
+++ src/qml/AccountsModel.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Telephony 0.1
 
 Item {

=== modified file 'src/qml/CMakeLists.txt'
--- src/qml/CMakeLists.txt	2015-04-30 15:42:48 +0000
+++ src/qml/CMakeLists.txt	2017-04-05 17:09:12 +0000
@@ -19,3 +19,4 @@
 add_subdirectory(ContactViewPage)
 add_subdirectory(ContactEditorPage)
 add_subdirectory(Dialogs)
+add_subdirectory(SettingsPage)

=== modified file 'src/qml/ContactsPage/ContactsPage.qml'
--- src/qml/ContactsPage/ContactsPage.qml	2016-07-27 23:51:39 +0000
+++ src/qml/ContactsPage/ContactsPage.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/ContactsPage/KeyboardRectagle.qml'
--- src/qml/ContactsPage/KeyboardRectagle.qml	2014-07-08 00:34:36 +0000
+++ src/qml/ContactsPage/KeyboardRectagle.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 Item {
     id: keyboardRect

=== modified file 'src/qml/DialerPage/CallButton.qml'
--- src/qml/DialerPage/CallButton.qml	2016-08-24 17:50:38 +0000
+++ src/qml/DialerPage/CallButton.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 AbstractButton {

=== modified file 'src/qml/DialerPage/CustomButton.qml'
--- src/qml/DialerPage/CustomButton.qml	2016-08-24 17:50:38 +0000
+++ src/qml/DialerPage/CustomButton.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 Button {

=== modified file 'src/qml/DialerPage/DialerBottomEdge.qml'
--- src/qml/DialerPage/DialerBottomEdge.qml	2016-08-24 17:53:12 +0000
+++ src/qml/DialerPage/DialerBottomEdge.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 BottomEdge {

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2016-10-18 09:28:54 +0000
+++ src/qml/DialerPage/DialerPage.qml	2017-04-05 17:09:12 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtContacts 5.0
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1
@@ -36,6 +36,17 @@
     property alias callAnimationRunning: callAnimation.running
     property bool greeterMode: false
     property var mmiPlugins: []
+    readonly property bool compactView: page.height <= units.gu(60)
+
+    function selectAccount(accountId) {
+        for (var i in accountsModel.activeAccounts) {
+            var account = accountsModel.activeAccounts[i]
+            if (account.accountId === accountId) {
+                headerSections.selectedIndex = i
+                return
+            }
+        }
+    }
 
     header: PageHeader {
         id: pageHeader
@@ -51,15 +62,23 @@
             Action {
                 iconName: "settings"
                 text: i18n.tr("Settings")
-                onTriggered: Qt.openUrlExternally("settings:///system/phone")
+                onTriggered: pageStackNormalMode.push(Qt.resolvedUrl("../SettingsPage/SettingsPage.qml"))
             }
 
         ]
         title: page.title
+        focus: false
         trailingActionBar {
             actions: mainView.greeterMode ? actionsGreeter : actionsNormal
         }
 
+        // make sure the SIM selector never gets focus
+        onFocusChanged: {
+            if (focus) {
+                focus = false
+            }
+        }
+
         leadingActionBar {
             property list<QtObject> backActionList: [
                 Action {
@@ -95,6 +114,7 @@
             id: headerSections
             model: mainView.multiplePhoneAccounts ? accountsModel.activeAccountNames : []
             selectedIndex: accountsModel.defaultCallAccountIndex
+            focus: false
             onSelectedIndexChanged: {
                 if (selectedIndex >= 0) {
                     mainView.account = accountsModel.activeAccounts[selectedIndex]
@@ -111,7 +131,6 @@
     }
 
     objectName: "dialerPage"
-
     title: {
         // avoid clearing the title when app is inactive
         // under some states
@@ -130,8 +149,11 @@
             var oldTitle = i18n.tr("SIM Locked")
             // show Emergency Calls for sim locked too. There is going to be an icon indicating it is locked
             return i18n.tr("Emergency Calls")
-        } else if (mainView.account && mainView.account.networkName != "") {
+        } else if (mainView.account && mainView.account.networkName && mainView.account.networkName != "") {
             return mainView.account.networkName
+        } else if (mainView.account && mainView.account.type != AccountEntry.PhoneAccount) {
+            return mainView.account.protocolInfo.serviceDisplayName != "" ? mainView.account.protocolInfo.serviceDisplayName :
+                                                                            mainView.account.protocolInfo.name
         } else if (multiplePhoneAccounts && !mainView.account) {
             return i18n.tr("Phone")
         }
@@ -165,6 +187,20 @@
         }
     ]
 
+    // Forward key presses
+    Keys.onPressed: {
+        if (!active) {
+            return
+        }
+
+        // in case Enter is pressed, remove focus from the view to prevent multiple calls to get placed
+        if (event.key == Qt.Key_Return || event.key == Qt.Key_Enter) {
+            page.focus = false;
+        }
+
+        keypad.keyPressed(event.key, event.text)
+    }
+
     function triggerCallAnimation() {
         callAnimation.start();
     }
@@ -231,7 +267,10 @@
         id: keypadContainer
 
         anchors {
-            fill: parent
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: footer.top
             topMargin: pageHeader.height
         }
         focus: true
@@ -246,16 +285,16 @@
                 right: parent.right
                 rightMargin: units.gu(2)
             }
-            height: units.gu(10)
+            height: page.compactView ? units.gu(7) : units.gu(10)
 
             CustomButton {
                 id: addContact
 
                 anchors {
                     left: parent.left
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: keypadEntry.verticalCenter
                 }
-                width: opacity > 0 ? units.gu(4) : 0
+                width: opacity > 0 ? (page.compactView ? units.gu(4) : units.gu(3)) : 0
                 height: (keypadEntry.value !== "" && contactWatcher.isUnknown) ? parent.height : 0
                 icon: "contact-new"
                 iconWidth: units.gu(3)
@@ -283,11 +322,15 @@
                     left: addContact.right
                     right: backspace.left
                 }
-                height: units.gu(4)
                 focus: true
                 placeHolder: i18n.tr("Enter a number")
                 Keys.forwardTo: [callButton]
                 value: mainView.pendingNumberToDial
+                height: page.compactView ? units.gu(2) : units.gu(4)
+                maximumFontSize: page.compactView ? units.dp(20) : units.dp(30)
+                onCommitRequested: {
+                    callButton.clicked()
+                }
             }
 
             CustomButton {
@@ -295,9 +338,9 @@
                 objectName: "eraseButton"
                 anchors {
                     right: parent.right
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: keypadEntry.verticalCenter
                 }
-                width: opacity > 0 ? units.gu(4) : 0
+                width: opacity > 0 ? (page.compactView ? units.gu(4) : units.gu(3)) : 0
                 height: input.text !== "" ? parent.height : 0
                 icon: "erase"
                 iconWidth: units.gu(3)
@@ -363,11 +406,21 @@
 
             anchors {
                 top: divider.bottom
-                topMargin: units.gu(2)
-                horizontalCenter: parent.horizontalCenter
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: units.gu(2)
             }
-
+            labelPixelSize: page.compactView ? units.dp(20) : units.dp(30)
+            spacing: page.compactView ? 0 : 5
             onKeyPressed: {
+                // handle special keys (backspace, arrows, etc)
+                keypadEntry.handleKeyEvent(keycode, keychar)
+
+                if (keycode == Qt.Key_Space) {
+                    return
+                }
+
                 callManager.playTone(keychar);
                 input.insert(input.cursorPosition, keychar)
                 if(checkMMI(dialNumber)) {

=== modified file 'src/qml/DialerPage/Keypad.qml'
--- src/qml/DialerPage/Keypad.qml	2016-08-24 17:51:16 +0000
+++ src/qml/DialerPage/Keypad.qml	2017-04-05 17:09:12 +0000
@@ -16,165 +16,239 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
+import QtQuick.Layouts 1.1
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 
 Item {
     id: keypad
 
-    property int keysWidth: units.gu(11)
-    property int keysHeight: units.gu(8)
+    readonly property int keysWidth: Math.min(units.gu(11), (keypad.width  / (keys.columns + 1)))
+    readonly property int keysHeight: Math.min(units.gu(8), (keypad.height / (keys.rows + 1)))
+    property double labelPixelSize: units.dp(30)
     property bool showVoicemail: false
-
-    width: keys.width
-    height: keys.height
+    property alias spacing: keys.columnSpacing
 
     signal keyPressed(int keycode, string keychar)
     signal keyPressAndHold(int keycode, string keychar)
 
-    Grid {
+    GridLayout {
         id: keys
 
         rows: 4
         columns: 3
-        columnSpacing: units.gu(2.0)
-        rowSpacing: units.gu(0.5)
-        anchors.centerIn: parent
+        rowSpacing: columnSpacing
+        anchors.fill: parent
+        //horizontalItemAlignment: Grid.AlignHCenter
+        //verticalItemAlignment: Grid.AlignVCenter
+
 
         KeypadButton {
             objectName: "buttonOne"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("1")
             keycode: Qt.Key_1
             onPressed: keypad.keyPressed(keycode, "1")
             onPressAndHold: keypad.keyPressAndHold(keycode, "1")
             iconSource: showVoicemail ? "voicemail" : ""
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonTwo"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("2")
             sublabel: i18n.tr("ABC")
             keycode: Qt.Key_2
             onPressed: keypad.keyPressed(keycode, "2")
             onPressAndHold: keypad.keyPressAndHold(keycode, "2")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonThree"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("3")
             sublabel: i18n.tr("DEF")
             keycode: Qt.Key_3
             onPressed: keypad.keyPressed(keycode, "3")
             onPressAndHold: keypad.keyPressAndHold(keycode, "3")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonFour"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("4")
             sublabel: i18n.tr("GHI")
             keycode: Qt.Key_4
             onPressed: keypad.keyPressed(keycode, "4")
             onPressAndHold: keypad.keyPressAndHold(keycode, "4")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonFive"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("5")
             sublabel: i18n.tr("JKL")
             keycode: Qt.Key_5
             onPressed: keypad.keyPressed(keycode, "5")
             onPressAndHold: keypad.keyPressAndHold(keycode, "5")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonSix"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("6")
             sublabel: i18n.tr("MNO")
             keycode: Qt.Key_6
             onPressed: keypad.keyPressed(keycode, "6")
             onPressAndHold: keypad.keyPressAndHold(keycode, "6")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonSeven"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("7")
             sublabel: i18n.tr("PQRS")
             keycode: Qt.Key_7
             onPressed: keypad.keyPressed(keycode, "7")
             onPressAndHold: keypad.keyPressAndHold(keycode, "7")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonEight"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("8")
             sublabel: i18n.tr("TUV")
             keycode: Qt.Key_8
             onPressed: keypad.keyPressed(keycode, "8")
             onPressAndHold: keypad.keyPressAndHold(keycode, "8")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonNine"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("9")
             sublabel: i18n.tr("WXYZ")
             keycode: Qt.Key_9
             onPressed: keypad.keyPressed(keycode, "9")
             onPressAndHold: keypad.keyPressAndHold(keycode, "9")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonAsterisk"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             isCorner: true
             corner: Qt.BottomLeftCorner
             label: i18n.tr("*")
             keycode: Qt.Key_Asterisk
             onPressed: keypad.keyPressed(keycode, "*")
             onPressAndHold: keypad.keyPressAndHold(keycode, "*")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonZero"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             label: i18n.tr("0")
             sublabel: i18n.tr("+")
             sublabelSize: "medium"
             keycode: Qt.Key_0
             onPressed: keypad.keyPressed(keycode, "0")
             onPressAndHold: keypad.keyPressAndHold(keycode, "0")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
 
         KeypadButton {
             objectName: "buttonHash"
-            width: keysWidth
-            height: keysHeight
+            implicitWidth: keysWidth
+            implicitHeight: keysHeight
             isCorner: true
             corner: Qt.BottomRightCorner
             label: i18n.tr("#")
             keycode: Qt.Key_ssharp
             onPressed: keypad.keyPressed(keycode, "#")
             onPressAndHold: keypad.keyPressAndHold(keycode, "#")
+            labelFont.pixelSize: keypad.labelPixelSize
+
+            // Layout
+            Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+            Layout.fillHeight: false
+            Layout.fillWidth: false
         }
     }
 }

=== modified file 'src/qml/DialerPage/KeypadButton.qml'
--- src/qml/DialerPage/KeypadButton.qml	2016-08-25 06:54:07 +0000
+++ src/qml/DialerPage/KeypadButton.qml	2017-04-05 17:09:12 +0000
@@ -16,19 +16,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 MouseArea {
     id: button
 
-    width: units.gu(11.33)
-    height: units.gu(7)
-
     property alias label: labelItem.text
     property alias sublabel: sublabelItem.text
     property alias sublabelSize: sublabelItem.fontSize
     property alias iconSource: subImage.name
+    property alias labelFont: labelItem.font
     property int keycode
     property bool isCorner: false
     property int corner
@@ -47,9 +45,7 @@
 
     Item {
         objectName: "keypadButtonLabelsContainer"
-        height: childrenRect.height
-        width: parent.width
-        anchors.centerIn: parent
+        anchors.fill: parent
         scale: button.pressed ? 0.9 : 1
 
         Behavior on scale {
@@ -61,23 +57,25 @@
         Label {
             id: labelItem
 
-            anchors.top: parent.top
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.verticalCenterOffset: -units.gu(0.5)
-            horizontalAlignment: Text.AlignHCenter
-            height: paintedHeight
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+                verticalCenterOffset: -units.gu(0.5)
+            }
+
             font.pixelSize: units.dp(30)
-            verticalAlignment: Text.AlignTop
             color: UbuntuColors.darkGrey
         }
 
         Label {
             id: sublabelItem
 
-            anchors.top: labelItem.bottom
-            anchors.topMargin: units.dp(1.5)
-            anchors.horizontalCenter: parent.horizontalCenter
-            horizontalAlignment: Text.AlignHCenter
+            anchors {
+                top: labelItem.bottom
+                topMargin: units.dp(1.5)
+                horizontalCenter: labelItem.horizontalCenter
+            }
+
             fontSize: "x-small"
             color: UbuntuColors.darkGrey
         }
@@ -85,9 +83,11 @@
         Icon {
             id: subImage
             visible: name != ""
-            anchors.top: labelItem.bottom
-            anchors.horizontalCenter: parent.horizontalCenter
-            anchors.topMargin: units.dp(1.5)
+            anchors {
+                top: labelItem.bottom
+                horizontalCenter: labelItem.horizontalCenter
+                topMargin: units.dp(1.5)
+            }
             opacity: 0.8
             width: units.gu(2)
             height: units.gu(2)

=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
--- src/qml/DialerPage/KeypadEntry.qml	2016-08-24 17:52:19 +0000
+++ src/qml/DialerPage/KeypadEntry.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Themes.Ambiance 1.3
@@ -30,19 +30,47 @@
     property alias input: input
     property alias placeHolder: hint.text
     property alias placeHolderPixelFontSize: hint.font.pixelSize
+    property double maximumFontSize: units.dp(30)
+
     // this is used by tests. do not remove it
     property alias selectedText: input.selectedText
 
+    signal commitRequested()
+
+    function handleKeyEvent(key, text) {
+        if (input.length == 0) {
+            return
+        }
+
+        switch (key) {
+        case Qt.Key_Backspace:
+            input.remove(input.cursorPosition-1, input.cursorPosition)
+            break
+        case Qt.Key_Delete:
+            input.remove(input.cursorPosition, input.cursorPosition+1)
+            break
+        case Qt.Key_Left:
+            input.cursorPosition--
+            break
+        case Qt.Key_Right:
+            input.cursorPosition++
+            break
+        case Qt.Key_Enter:
+        case Qt.Key_Return:
+            keypadEntry.commitRequested()
+            break
+        }
+    }
+
     onValueChanged: input.deselect()
+    onMaximumFontSizeChanged: input.adjustTextSize()
 
     PhoneNumberField {
         id: input
 
         property bool __adjusting: false
-        readonly property double maximumFontSize: units.dp(30)
         readonly property double minimumFontSize: FontUtils.sizeToPixels("large")
 
-
         style: TextFieldStyle {
             background: null
             frameSpacing: 0
@@ -58,7 +86,7 @@
             __adjusting = true;
 
             // start by resetting the font size to discover the scale that should be used
-            font.pixelSize = maximumFontSize
+            font.pixelSize = keypadEntry.maximumFontSize
 
             // check if it really needs to be scaled
             if (contentWidth > width) {
@@ -76,7 +104,6 @@
             verticalCenter: parent.verticalCenter
         }
         horizontalAlignment: (text.length < 19 ? TextInput.AlignHCenter : TextInput.AlignRight)
-        font.pixelSize: maximumFontSize
         font.family: "Ubuntu"
         color: UbuntuColors.darkGrey
         focus: false
@@ -108,6 +135,7 @@
             target: units
             onGridUnitChanged: input.adjustTextSize()
         }
+        Component.onCompleted: input.adjustTextSize()
     }
 
     MouseArea {
@@ -132,7 +160,7 @@
         }
 
         text: ""
-        font.pixelSize: input.maximumFontSize
+        font.pixelSize: input.font.pixelSize
         fontSizeMode: Text.HorizontalFit
         color: UbuntuColors.darkGrey
         opacity: 0.9

=== modified file 'src/qml/Dialogs/DisableFlightModeDialog.qml'
--- src/qml/Dialogs/DisableFlightModeDialog.qml	2016-08-25 16:01:46 +0000
+++ src/qml/Dialogs/DisableFlightModeDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1

=== modified file 'src/qml/Dialogs/FlightModeProgressDialog.qml'
--- src/qml/Dialogs/FlightModeProgressDialog.qml	2016-08-24 17:52:19 +0000
+++ src/qml/Dialogs/FlightModeProgressDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/Dialogs/NoDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2016-10-19 11:45:45 +0000
+++ src/qml/Dialogs/NoDefaultSIMCardDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1

=== modified file 'src/qml/Dialogs/NotificationDialog.qml'
--- src/qml/Dialogs/NotificationDialog.qml	2015-09-07 15:40:45 +0000
+++ src/qml/Dialogs/NotificationDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 

=== modified file 'src/qml/Dialogs/SetDefaultSIMCardDialog.qml'
--- src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2016-10-01 00:29:13 +0000
+++ src/qml/Dialogs/SetDefaultSIMCardDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 import Ubuntu.Telephony 0.1

=== modified file 'src/qml/Dialogs/SimLockedDialog.qml'
--- src/qml/Dialogs/SimLockedDialog.qml	2016-04-29 21:29:29 +0000
+++ src/qml/Dialogs/SimLockedDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 

=== modified file 'src/qml/Dialogs/UssdErrorDialog.qml'
--- src/qml/Dialogs/UssdErrorDialog.qml	2016-08-24 17:52:19 +0000
+++ src/qml/Dialogs/UssdErrorDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/Dialogs/UssdProgressDialog.qml'
--- src/qml/Dialogs/UssdProgressDialog.qml	2016-08-24 17:52:19 +0000
+++ src/qml/Dialogs/UssdProgressDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/Dialogs/UssdResponseDialog.qml'
--- src/qml/Dialogs/UssdResponseDialog.qml	2016-08-24 17:52:19 +0000
+++ src/qml/Dialogs/UssdResponseDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/HistoryPage/ExpandableButton.qml'
--- src/qml/HistoryPage/ExpandableButton.qml	2016-08-24 17:50:38 +0000
+++ src/qml/HistoryPage/ExpandableButton.qml	2017-04-05 17:09:12 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 

=== modified file 'src/qml/HistoryPage/HistoryDelegate.qml'
--- src/qml/HistoryPage/HistoryDelegate.qml	2016-07-27 16:18:56 +0000
+++ src/qml/HistoryPage/HistoryDelegate.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Components.Popups 1.3

=== modified file 'src/qml/HistoryPage/HistoryDetailsPage.qml'
--- src/qml/HistoryPage/HistoryDetailsPage.qml	2016-10-19 11:45:45 +0000
+++ src/qml/HistoryPage/HistoryDetailsPage.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Telephony 0.1

=== modified file 'src/qml/HistoryPage/HistoryPage.qml'
--- src/qml/HistoryPage/HistoryPage.qml	2016-07-27 16:18:56 +0000
+++ src/qml/HistoryPage/HistoryPage.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.History 0.1
@@ -147,8 +147,17 @@
         }
     }
 
-    HistoryFilter {
+    // FIXME: this is a workaround to force the model perform the query
+    HistoryUnionFilter {
         id: emptyFilter
+        HistoryFilter {
+            filterProperty: "missed"
+            filterValue: true
+        }
+        HistoryFilter {
+            filterProperty: "missed"
+            filterValue: false
+        }
     }
 
     HistoryFilter {

=== modified file 'src/qml/HistoryPage/SwipeItemDemo.qml'
--- src/qml/HistoryPage/SwipeItemDemo.qml	2016-02-11 17:58:29 +0000
+++ src/qml/HistoryPage/SwipeItemDemo.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import Qt.labs.settings 1.0
 

=== modified file 'src/qml/InputInfo.qml'
--- src/qml/InputInfo.qml	2016-03-08 02:27:36 +0000
+++ src/qml/InputInfo.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import QtSystemInfo 5.5
 
 Item {

=== modified file 'src/qml/LiveCallPage/ConferenceCallDisplay.qml'
--- src/qml/LiveCallPage/ConferenceCallDisplay.qml	2016-08-24 17:50:38 +0000
+++ src/qml/LiveCallPage/ConferenceCallDisplay.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItem
 import Ubuntu.Telephony 0.1

=== modified file 'src/qml/LiveCallPage/HangupButton.qml'
--- src/qml/LiveCallPage/HangupButton.qml	2016-08-24 17:50:38 +0000
+++ src/qml/LiveCallPage/HangupButton.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 AbstractButton {

=== modified file 'src/qml/LiveCallPage/LiveCall.qml'
--- src/qml/LiveCallPage/LiveCall.qml	2016-03-08 02:10:46 +0000
+++ src/qml/LiveCallPage/LiveCall.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Components.Popups 1.3
@@ -30,6 +30,8 @@
     id: liveCall
     objectName: "pageLiveCall"
 
+    readonly property bool compactView: liveCall.height <= units.gu(60)
+
     property var call: callManager.foregroundCall
     property var calls: callManager.calls
     property string dtmfEntry: ""
@@ -50,8 +52,8 @@
             return i18n.tr("Conference");
         } else if (contactWatcher.alias !== "") {
             return contactWatcher.alias;
-        } else if (contactWatcher.identifier !== "") {
-            return contactWatcher.identifier;
+        } else if (call && call.phoneNumber !== "") {
+            return call.phoneNumber;
         } else if (!call && initialNumber != "") {
             return initialNumber
         } else {
@@ -90,6 +92,14 @@
         extension: multiplePhoneAccounts ? headerSections : null
     }
 
+    Keys.onPressed: {
+        if (!dtmfVisible) {
+            dtmfVisible = true
+        }
+
+        keypad.keyPressed(event.key, event.text)
+    }
+
     function reportStatus(callObject, text) {
         // if a previous status was already set, do not overwrite it
         if (statusLabel.text !== "" || callManager.hasCalls) {
@@ -140,7 +150,7 @@
             callObject["active"] = true;
             callObject["voicemail"] = call.voicemail;
             callObject["account"] = call.account;
-            callObject["phoneNumber"] = call.phoneNumber;
+            callObject["phoneNumber"] = contactWatcher.identifier;
             callObject["held"] = call.held;
             callObject["muted"] = call.muted;
             callObject["activeAudioOutput"] = call.activeAudioOutput;
@@ -282,6 +292,7 @@
 
     Component.onCompleted: {
         callManager.callIndicatorVisible = !active && callManager.hasCalls;
+        forceActiveFocus();
     }
 
     Timer {
@@ -381,7 +392,15 @@
         ContactWatcher {
             id: contactWatcher
             // FIXME: handle conf calls
-            identifier: call ? call.phoneNumber : ""
+            identifier: {
+                if (initialNumber != "") {
+                    return initialNumber
+                } else if (call) {
+                    return call.phoneNumber
+                }
+                return ""
+            }
+
             onDetailPropertiesChanged: helper.updateSubTypeLabel()
             onIsUnknownChanged: helper.updateSubTypeLabel()
             // FIXME: if we implement VOIP, get the addressable fields from the account itself
@@ -444,20 +463,26 @@
             horizontalAlignment: Qt.AlignHCenter
             width: units.gu(11)
             text: {
+                var duration = ""
                 if (dtmfVisible && dtmfLabelHelper.text !== "") {
-                    return dtmfLabelHelper.text;
+                    duration = dtmfLabelHelper.text;
                 } else if (call && call.active) {
                     // TRANSLATORS: %1 is the call duration here.
-                    return call.held ? i18n.tr("%1 - on hold").arg(stopWatch.elapsed) : stopWatch.elapsed;
+                    duration = call.held ? i18n.tr("%1 - on hold").arg(stopWatch.elapsed) : stopWatch.elapsed;
                 } else if (call && !call.incoming) {
-                    return i18n.tr("Calling")
+                    duration = i18n.tr("Calling")
                 } else if (!call && initialStatus !== "") {
-                    return initialStatus
+                    duration = initialStatus
                 } else {
-                    return " "
+                    duration = " "
                 }
+
+                if (liveCall.compactView)
+                    return "%1 (%2)".arg(duration).arg(caller)
+                else
+                    return duration
             }
-            fontSize: "x-large"
+            fontSize: liveCall.compactView ? "large" : "x-large"
         }
 
         Label {
@@ -469,8 +494,11 @@
                 horizontalCenter: parent.horizontalCenter
             }
             text: caller
-            fontSize: "large"
             color: UbuntuColors.darkGrey
+
+            fontSize:"large"
+            visible: !liveCall.compactView
+            height: visible ? implicitHeight : 0
         }
 
         MultiCallDisplay {
@@ -490,7 +518,7 @@
                 left: parent.left
                 right: parent.right
                 top: callerLabel.bottom
-                topMargin: units.gu(2)
+                topMargin: liveCall.compactView ? units.gu(0.5) : units.gu(2)
             }
         }
 
@@ -500,7 +528,9 @@
             anchors {
                 top: divider.bottom
                 topMargin: units.gu(2)
-                horizontalCenter: parent.horizontalCenter
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
             }
             onKeyPressed: {
                 if (call) {
@@ -511,8 +541,8 @@
 
             visible: opacity > 0.0
             opacity: 0.0
-            keysWidth: units.gu(11)
-            keysHeight: units.gu(7)
+            labelPixelSize: liveCall.compactView ? units.dp(20) : units.dp(30)
+            spacing: liveCall.compactView ? 0 : 5
         }
     }
 
@@ -571,7 +601,7 @@
 
         anchors {
             horizontalCenter: parent.horizontalCenter
-            bottom: footer.top
+            bottom: hangupButton.top
             bottomMargin: units.gu(1)
         }
 
@@ -617,6 +647,7 @@
                     }
                 }
             }
+            enabled: audioOutputs.length > 1
         }
 
         LiveCallKeypadButton {
@@ -675,25 +706,15 @@
         }
     }
 
-    Item {
-        id: footer
-        height: units.gu(10)
+    HangupButton {
+        id: hangupButton
+        objectName: "hangupButton"
+
         anchors {
+            horizontalCenter: parent.horizontalCenter
             bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
-
-        HangupButton {
-            id: hangupButton
-            objectName: "hangupButton"
-
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                bottom: parent.bottom
-                bottomMargin: units.gu(5)
-            }
-            onClicked: endCall()
-        }
+            bottomMargin: liveCall.compactView ? units.gu(1) : units.gu(5)
+        }
+        onClicked: endCall()
     }
 }

=== modified file 'src/qml/LiveCallPage/LiveCallKeypadButton.qml'
--- src/qml/LiveCallPage/LiveCallKeypadButton.qml	2016-08-24 17:50:38 +0000
+++ src/qml/LiveCallPage/LiveCallKeypadButton.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 AbstractButton {

=== modified file 'src/qml/LiveCallPage/MultiCallDisplay.qml'
--- src/qml/LiveCallPage/MultiCallDisplay.qml	2015-09-07 15:40:45 +0000
+++ src/qml/LiveCallPage/MultiCallDisplay.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.ListItems 1.3 as ListItems
 import Ubuntu.Contacts 0.1

=== modified file 'src/qml/LiveCallPage/StopWatch.qml'
--- src/qml/LiveCallPage/StopWatch.qml	2015-09-07 15:40:45 +0000
+++ src/qml/LiveCallPage/StopWatch.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 
 Item {

=== modified file 'src/qml/MMI/IMEI.qml'
--- src/qml/MMI/IMEI.qml	2016-08-24 17:52:19 +0000
+++ src/qml/MMI/IMEI.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3
 

=== modified file 'src/qml/MMI/IMEIDialog.qml'
--- src/qml/MMI/IMEIDialog.qml	2016-10-18 09:28:54 +0000
+++ src/qml/MMI/IMEIDialog.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Ubuntu.Telephony 0.1
 import Ubuntu.Components 1.3
 import Ubuntu.Components.Popups 1.3

=== added directory 'src/qml/SettingsPage'
=== added directory 'src/qml/SettingsPage/AccountSettings'
=== added file 'src/qml/SettingsPage/AccountSettings/CMakeLists.txt'
--- src/qml/SettingsPage/AccountSettings/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/AccountSettings/CMakeLists.txt	2017-04-05 17:09:12 +0000
@@ -0,0 +1,6 @@
+file(GLOB ACCOUNT_SETTINGS_QML_JS_FILES *.qml *.js)
+
+# make the files visible on qtcreator
+add_custom_target(dialer__account_settings_QMlFiles ALL SOURCES ${ACCOUNT_SETTINGS_QML_JS_FILES})
+
+install(FILES ${ACCOUNT_SETTINGS_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/SettingsPage/AccountSettings)

=== added file 'src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml'
--- src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/AccountSettings/SipNumberRewrite.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,177 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2017 Canonical Ltd.
+ *
+ * Authors: Gustavo Pichorim Boiko <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItems
+import Ubuntu.Components.Themes.Ambiance 0.1
+import "../"
+
+Page {
+    id: page
+    // TRANSLATORS: %1 is the displayname of the account
+    title: i18n.tr("%1 Number Rewrite").arg(account.displayName)
+    header: PageHeader {
+        title: page.title
+        flickable: contentFlickable
+    }
+
+    property var account: null
+    property bool updating: false
+    onAccountChanged: {
+        if (!account) {
+            return
+        }
+
+
+        var props = account.accountProperties
+        for (var i in props) {
+            console.log(i + ": " + props[i])
+            console.log(props.defaultAreaCode)
+        }
+
+        updating = true
+        numberRewriteSwitch.checked = props.numberRewrite ? props.numberRewrite : false
+        countryCodeField.text = props.defaultCountryCode ? props.defaultCountryCode : ""
+        areaCodeField.text = props.defaultAreaCode ? props.defaultAreaCode : ""
+        removeInputField.text = props.removeCharacters ? props.removeCharacters : ""
+        prefixInputField.text = props.prefix ? props.prefix : ""
+        updating = false
+    }
+
+    function setAccountProperty(prop, value) {
+        if (updating) {
+            return
+        }
+
+        var properties = account.accountProperties
+        properties[prop] = value
+        account.accountProperties = properties
+    }
+
+    Flickable {
+        id: contentFlickable
+        anchors.fill: parent
+        Column {
+            height: childrenRect.height
+            spacing: units.gu(1)
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            ListItems.Standard {
+                control: Switch {
+                    id: numberRewriteSwitch
+                    objectName: "numberRewriteSwitch"
+                    onCheckedChanged: {
+                        setAccountProperty("numberRewrite", checked)
+                    }
+                }
+                text: i18n.tr("Number rewrite")
+                showDivider: !numberRewriteSwitch.checked
+            }
+
+            ListItems.Standard {
+                id: countryCodeItem
+                height: visible ? units.gu(6) : 0
+                visible: numberRewriteSwitch.checked
+                text: i18n.tr("Default country code")
+                control: SettingsTextField {
+                    id: countryCodeField
+                    objectName: "countryCodeField"
+                    placeholderText: i18n.tr("Enter a country code")
+                    onTextChanged: {
+                        setAccountProperty("defaultCountryCode", text)
+                    }
+                }
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+
+            ListItems.Standard {
+                id: areaCodeItem
+                height: visible ? units.gu(6) : 0
+                // FIXME: re-enable the area code when we get libphonenumber detection fixed
+                //visible: numberRewriteSwitch.checked
+                visible: false
+                text: i18n.tr("Default area code")
+                control: SettingsTextField {
+                    id: areaCodeField
+                    objectName: "areaCodeField"
+                    placeholderText: i18n.tr("Enter an area code")
+                    onTextChanged: {
+                        setAccountProperty("defaultAreaCode", text)
+                    }
+                }
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+
+            ListItems.Standard {
+                id: removeInput
+                visible: numberRewriteSwitch.checked
+                height: visible ? units.gu(6) : 0
+                text: i18n.tr("Characters to remove")
+                control: SettingsTextField {
+                    id: removeInputField
+                    objectName: "removeInputField"
+                    placeholderText: i18n.tr("Enter the characters to remove")
+                    onTextChanged: {
+                        setAccountProperty("removeCharacters", text)
+                    }
+                }
+
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+
+            ListItems.Standard {
+                id: prefixInput
+                visible: numberRewriteSwitch.checked
+                height: visible ? units.gu(6) : 0
+                text: i18n.tr("Prefix")
+                control: SettingsTextField {
+                    id: prefixInputField
+                    objectName: "prefixInputField"
+                    placeholderText: i18n.tr("Enter a prefix")
+                    onTextChanged: {
+                        setAccountProperty("prefix", text)
+                    }
+                }
+
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/AccountSettings/sip.qml'
--- src/qml/SettingsPage/AccountSettings/sip.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/AccountSettings/sip.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,30 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2017 Canonical Ltd.
+ *
+ * Authors: Gustavo Pichorim Boiko <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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 Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItems
+
+ListItems.SingleValue {
+    property var account: null
+    text: i18n.tr("%1 Number Rewrite").arg(account.displayName)
+    progression: true
+    value: account.accountProperties.numberRewrite ? i18n.tr("On") : i18n.tr("Off")
+    onClicked: pageStackNormalMode.push(Qt.resolvedUrl("SipNumberRewrite.qml"), { "account": account })
+}

=== added file 'src/qml/SettingsPage/CMakeLists.txt'
--- src/qml/SettingsPage/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/CMakeLists.txt	2017-04-05 17:09:12 +0000
@@ -0,0 +1,8 @@
+file(GLOB SETTINGS_QML_JS_FILES *.qml *.js)
+
+# make the files visible on qtcreator
+add_custom_target(dialer_settings_QMlFiles ALL SOURCES ${SETTINGS_QML_JS_FILES})
+
+install(FILES ${SETTINGS_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/SettingsPage)
+
+add_subdirectory(AccountSettings)

=== added file 'src/qml/SettingsPage/CallForwardItem.qml'
--- src/qml/SettingsPage/CallForwardItem.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/CallForwardItem.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,240 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2015-2017 Canonical Ltd.
+ *
+ * Contact: Jonas G. Drange <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Themes.Ambiance 0.1
+import MeeGo.QOfono 0.2
+import "callForwardingUtils.js" as Utils
+
+Column {
+    id: item
+
+    property OfonoCallForwarding callForwarding
+    property bool enabled: true
+    property string rule
+
+    property alias checked: check.checked
+    property alias busy: d._pending
+    property alias text: control.text
+    property alias value: current.value
+    property alias field: field
+
+    signal checked ()
+    signal failed ()
+    signal enteredEditMode ()
+    signal leftEditMode ()
+
+   /**
+     * Saves the rule.
+     */
+    function save () {
+        d._pending = true;
+        if (!Utils.requestRule(field.text)) {
+            d._pending = false;
+            d._editing = false;
+            checked: callForwarding[rule] !== "";
+        }
+    }
+
+   /**
+     * Cancels editing the rule.
+     */
+    function cancel () {
+        d._editing = false;
+        check.checked = callForwarding[rule] !== "";
+    }
+
+    /**
+     * Private object that keeps track of state of the UI.
+     */
+    QtObject {
+        id: d
+
+        /**
+         * Server is working.
+         */
+        property bool _pending: !callForwarding.ready
+
+        /**
+         * Server failed to change/fetch setting.
+         */
+        property bool _failed: false
+
+        /**
+         * We're editing.
+         */
+        property bool _editing: false
+        on_EditingChanged: Utils.editingChanged()
+
+        /**
+         * Whether or not the forwarding rule is active.
+         */
+        property bool _active: callForwarding[rule] !== ""
+    }
+
+    states: [
+        State {
+            name: "failed"
+            when: d._failed
+            PropertyChanges { target: control; enabled: false; control: check }
+            PropertyChanges { target: check; checked: false }
+            PropertyChanges { target: failed; visible: true }
+            PropertyChanges { target: activity; visible: false }
+        },
+        State {
+            name: "disabled"
+            when: !enabled
+            PropertyChanges { target: control; enabled: false }
+            PropertyChanges { target: check; enabled: false }
+            PropertyChanges { target: current; enabled: false }
+        },
+        State {
+            name: "requesting"
+            when: d._editing && d._pending
+            PropertyChanges { target: control; control: activity }
+            PropertyChanges { target: check; enabled: false; visible: false }
+            PropertyChanges { target: current; enabled: false; visible: true }
+        },
+        State {
+            name: "pending"
+            when: d._pending
+            PropertyChanges { target: control; control: activity }
+            PropertyChanges { target: check; enabled: false; visible: false }
+            PropertyChanges { target: current; enabled: false; visible: false }
+        },
+        State {
+            name: "editing"
+            when: d._editing
+            PropertyChanges { target: check; enabled: false }
+            PropertyChanges { target: current; visible: false }
+            PropertyChanges { target: input; visible: true }
+        },
+        State {
+            name: "active"
+            when: d._active
+            PropertyChanges { target: current; visible: true }
+        }
+    ]
+
+    ListItem.ThinDivider { anchors { left: parent.left; right: parent.right }}
+
+    ListItem.Standard {
+        id: control
+        onClicked: check.trigger(!check.checked)
+        control: CheckBox {
+            id: check
+            objectName: "check_" + rule
+            checked: callForwarding[rule] !== ""
+            onTriggered: Utils.checked(checked)
+            visible: !activity.running
+        }
+    }
+
+    ListItem.Standard {
+        id: input
+        visible: false
+        height: visible ? units.gu(6) : 0
+        /* TRANSLATORS: This string will be truncated on smaller displays. */
+        text: i18n.tr("Forward to")
+        control: TextField {
+            id: field
+            objectName: "field_" + rule
+            horizontalAlignment: TextInput.AlignRight
+            inputMethodHints: Qt.ImhDialableCharactersOnly
+            text: callForwarding[rule]
+            font.pixelSize: units.dp(18)
+            font.weight: Font.Light
+            font.family: "Ubuntu"
+            color: "#AAAAAA"
+            maximumLength: 20
+            focus: true
+            cursorVisible: text === "" || text !== callForwarding[rule]
+            placeholderText: i18n.tr("Enter a number")
+            style: TextFieldStyle {
+                overlaySpacing: units.gu(0.5)
+                frameSpacing: 0
+                background: Rectangle {
+                    property bool error: (field.hasOwnProperty("errorHighlight") &&
+                                          field.errorHighlight &&
+                                          !field.acceptableInput)
+                    onErrorChanged: error ? theme.palette.normal.negative : color
+                    color: Theme.palette.normal.background
+                    anchors.fill: parent
+                    visible: field.activeFocus
+                }
+            }
+
+            onVisibleChanged:
+                if (visible === true) forceActiveFocus()
+        }
+
+        Behavior on height {
+            NumberAnimation {
+                duration: UbuntuAnimation.SnapDuration
+            }
+        }
+    }
+
+    ListItem.SingleValue {
+        id: current
+        objectName: "current_" + rule
+        visible: value
+        /* TRANSLATORS: This string will be truncated on smaller displays. */
+        text: i18n.tr("Forward to")
+        value: callForwarding[rule]
+        onClicked: d._editing = true
+    }
+
+    /* Error message shown when updating fails. */
+    Label {
+        id: failed
+        anchors {
+            left: parent.left; right: parent.right; margins: units.gu(2);
+        }
+        visible: false
+        height: contentHeight + units.gu(4)
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        color: theme.palette.normal.negative
+        text: i18n.tr("Call forwarding can't be changed right now.")
+    }
+
+    ActivityIndicator {
+        id: activity
+        running: d._pending
+        visible: running
+    }
+
+    Connections {
+        target: item
+        Component.onCompleted: {
+            item.callForwarding[item.rule + 'Changed'].connect(Utils.ruleChanged);
+            item.callForwarding[item.rule + 'Complete'].connect(Utils.ruleComplete);
+            item.callForwarding.readyChanged.connect(Utils.ruleReadyChanged);
+        }
+        Component.onDestruction: {
+            item.callForwarding[item.rule + 'Changed'].disconnect(Utils.ruleChanged);
+            item.callForwarding[item.rule + 'Complete'].disconnect(Utils.ruleComplete);
+            item.callForwarding.readyChanged.disconnect(Utils.ruleReadyChanged);
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/CallForwarding.qml'
--- src/qml/SettingsPage/CallForwarding.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/CallForwarding.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,393 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2013-2017 Canonical Ltd.
+ *
+ * Contact:
+ *     Sebastien Bacher <[e-mail]>
+ *     Jonas G. Drange <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
+ *
+ * TODO: Add centrally stored setting for each call forwarding that describes a
+ *       contact. lp:1467816
+ *
+ * TODO: If a setting failed to be set, the error text should be followed by
+ *       “Contact {carrier name} for more information.”.
+ */
+
+import QtQuick 2.4
+import QtContacts 5.0
+import MeeGo.QOfono 0.2
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Components.Popups 1.3
+import Ubuntu.Components.Themes.Ambiance 0.1
+import Ubuntu.Content 1.3
+import "callForwardingUtils.js" as Utils
+
+Page {
+    id: page
+    objectName: "callForwardingPage"
+    title: headerTitle
+    property var sim
+    property string headerTitle: i18n.tr("Call forwarding")
+    property QtObject editing: null
+    property QtObject activeItem: null
+    property var activeTransfer
+
+    header: PageHeader {
+        id: pageHeader
+        title: page.title
+        flickable: flick
+    }
+
+    states: [
+        State {
+            name: "forwardBusy"
+            PropertyChanges { target: fwdSomeTitle; enabled: false }
+            PropertyChanges { target: fwdAll; enabled: false; }
+            PropertyChanges { target: fwdBusy; enabled: false; }
+            PropertyChanges { target: fwdLost; enabled: false; }
+            PropertyChanges { target: fwdUnreachable; enabled: false; }
+            when: fwdAll.busy || fwdBusy.busy || fwdLost.busy || fwdUnreachable.busy
+        },
+        State {
+            name: "forwardFailed"
+            PropertyChanges { target: fwdSomeTitle; enabled: false }
+            PropertyChanges { target: fwdFailedLabel; visible: true }
+            PropertyChanges { target: fwdAll; enabled: false; }
+            PropertyChanges { target: fwdBusy; enabled: false; }
+            PropertyChanges { target: fwdLost; enabled: false; }
+            PropertyChanges { target: fwdUnreachable; enabled: false; }
+        },
+        State {
+            name: "editing"
+            PropertyChanges { target: fwdAll; enabled: false; explicit: true }
+            PropertyChanges { target: fwdBusy; enabled: false; explicit: true }
+            PropertyChanges { target: fwdLost; enabled: false; explicit: true }
+            PropertyChanges { target: fwdUnreachable; enabled: false; explicit: true }
+            PropertyChanges { target: fwdSomeTitle; enabled: false }
+            StateChangeScript {
+                name: "editingEnabled"
+                script: {
+                    editing.opacity = 1;
+                    editing.enabled = true;
+                }
+            }
+            when: editing !== null
+        },
+        State {
+            name: "forwardAll"
+            PropertyChanges { target: fwdSomeTitle; }
+            PropertyChanges { target: fwdBusy; enabled: false; value: ""; checked: false }
+            PropertyChanges { target: fwdLost; enabled: false; value: ""; checked: false }
+            PropertyChanges { target: fwdUnreachable; enabled: false; value: ""; checked: false }
+            when: fwdAll.value !== ""
+        }
+    ]
+
+    Flickable {
+        id: flick
+
+        // this is necessary to avoid the page to appear below the header
+        clip: true
+        flickableDirection: Flickable.VerticalFlick
+        anchors {
+            fill: parent
+            bottomMargin: keyboardButtons.height + keyboard.height
+        }
+        contentHeight: contents.height + units.gu(2)
+        contentWidth: parent.width
+
+        // after add a new field we need to wait for the contentHeight to
+        // change to scroll to the correct position
+        onContentHeightChanged: Utils.show(page.activeItem)
+
+        Column {
+            id: contents
+            anchors { left: parent.left; right: parent.right }
+            spacing: units.gu(1)
+
+            CallForwardItem {
+                id: fwdAll
+                anchors { left: parent.left; right: parent.right }
+                rule: "voiceUnconditional"
+                callForwarding: callForwarding
+                text: i18n.tr("Forward every incoming call")
+                onEnteredEditMode: {page.editing = fwdAll; Utils.show(field)}
+                onLeftEditMode: page.editing = null
+            }
+
+            Label {
+                id: fwdAllCaption
+                anchors {
+                    left: parent.left; right: parent.right; margins: units.gu(1)
+                }
+                width: parent.width
+                wrapMode: Text.WordWrap
+                fontSize: "small"
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                text: i18n.tr("Redirects all phone calls to another number.")
+                opacity: 0.8
+            }
+
+            Label {
+                id: fwdFailedLabel
+                anchors {
+                    left: parent.left; right: parent.right; margins: units.gu(2)
+                }
+                width: parent.width
+                wrapMode: Text.WordWrap
+                visible: false
+                text: i18n.tr("Call forwarding status can't be checked " +
+                              "now. Try again later.")
+                color: theme.palette.normal.negative
+                horizontalAlignment: Text.AlignHCenter
+            }
+
+            SettingsItemTitle {
+                id: fwdSomeTitle
+                text: i18n.tr("Forward incoming calls when:")
+            }
+
+            CallForwardItem {
+                id: fwdBusy
+                objectName: "fwdBusy"
+                anchors { left: parent.left; right: parent.right }
+                callForwarding: callForwarding
+                rule: "voiceBusy"
+                text: i18n.tr("I'm on another call")
+                onEnteredEditMode: {page.editing = fwdBusy; Utils.show(field)}
+                onLeftEditMode: page.editing = null
+            }
+
+            CallForwardItem {
+                id: fwdLost
+                objectName: "fwdLost"
+                anchors { left: parent.left; right: parent.right }
+                callForwarding: callForwarding
+                rule: "voiceNoReply"
+                text: i18n.tr("I don't answer")
+                onEnteredEditMode: {page.editing = fwdLost; Utils.show(field)}
+                onLeftEditMode: page.editing = null
+            }
+
+            CallForwardItem {
+                id: fwdUnreachable
+                objectName: "fwdUnreachable"
+                anchors { left: parent.left; right: parent.right }
+                callForwarding: callForwarding
+                rule: "voiceNotReachable"
+                text: i18n.tr("My phone is unreachable")
+                onEnteredEditMode: {
+                    page.editing = fwdUnreachable;
+                    Utils.show(field);
+                }
+                onLeftEditMode: page.editing = null
+            }
+        }
+    } // Flickable
+
+    Rectangle {
+        id: keyboardButtons
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: keyboard.top
+        }
+        color: Theme.palette.selected.background
+        visible: editing !== null
+        height: units.gu(6)
+        Button {
+            id: kbdContacts
+            objectName: "contactsButton"
+            anchors {
+                left: parent.left
+                leftMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+            }
+            activeFocusOnPress: false
+            enabled: editing && !editing.busy
+            text: i18n.tr("Contacts...")
+            onClicked: page.activeTransfer = contactPicker.request()
+        }
+
+        Button {
+            id: kbdCancel
+            objectName: "cancelButton"
+            anchors {
+                right: kbdSet.left
+                rightMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+            }
+            enabled: editing && !editing.busy
+            text: i18n.tr("Cancel")
+            onClicked: editing.cancel()
+        }
+
+        Button {
+            id: kbdSet
+            objectName: "setButton"
+            anchors {
+                right: parent.right
+                rightMargin: units.gu(1)
+                verticalCenter: parent.verticalCenter
+            }
+            enabled: editing && !editing.busy && editing.field.text
+            text: i18n.tr("Set")
+            activeFocusOnPress: false
+            onClicked: editing.save()
+        }
+    }
+
+    KeyboardRectangle {
+        id: keyboard
+        anchors.bottom: parent.bottom
+        onHeightChanged: {
+            if (page.activeItem) {
+                Utils.show(page.activeItem);
+            }
+        }
+    }
+
+    Component {
+        id: chooseNumberDialog
+        Dialog {
+            id: dialog
+            property var contact
+            title: i18n.tr("Please select a phone number")
+
+            ListItem.ItemSelector {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                activeFocusOnPress: false
+                expanded: true
+                text: i18n.tr("Numbers")
+                model: contact.phoneNumbers
+                selectedIndex: -1
+                delegate: OptionSelectorDelegate {
+                    text: modelData.number
+                    activeFocusOnPress: false
+                }
+                onDelegateClicked: {
+                    editing.field.text = contact.phoneNumbers[index].number;
+                    PopupUtils.close(dialog);
+                }
+            }
+        }
+    }
+
+    Component {
+        id: hadNoNumberDialog
+        Dialog {
+            id: dialog
+            title: i18n.tr("Could not forward to this contact")
+            text: i18n.tr("Contact not associated with any phone number.")
+            Button {
+                text: i18n.tr("OK")
+                activeFocusOnPress: false
+                onClicked: PopupUtils.close(dialog)
+            }
+        }
+    }
+
+    VCardParser {
+        id: contactParser
+
+        function parseContact(vcardContact) {
+            return vcardContact;
+        }
+
+        onVcardParsed: {
+            var contact;
+            if (contacts.length === 0) {
+                console.warn('no contacts parsed');
+                return;
+            } else {
+                contact = parseContact(contacts[0]);
+                if (contact.phoneNumbers.length < 1) {
+                    PopupUtils.open(hadNoNumberDialog);
+                } else if (contact.phoneNumbers.length > 1) {
+                    PopupUtils.open(chooseNumberDialog, page, {
+                        'contact': contact
+                    });
+                } else {
+                    editing.field.text = contact.phoneNumber.number;
+                }
+            }
+        }
+    }
+
+    ContentTransferHint {
+        id: importHint
+        anchors.fill: parent
+        activeTransfer: page.activeTransfer
+    }
+
+    ContentPeer {
+        id: contactPicker
+        contentType: ContentType.Contacts
+        handler: ContentHandler.Source
+        selectionType: ContentTransfer.Single
+    }
+
+    Connections {
+        target: page.activeTransfer ? page.activeTransfer : null
+        onStateChanged: {
+            if (page.activeTransfer.state === ContentTransfer.Charged) {
+                contactParser.vCardUrl = page.activeTransfer.items[0].url;
+            }
+        }
+    }
+
+    Connections {
+        target: callForwarding
+        onGetPropertiesFailed: page.state = "forwardFailed";
+    }
+
+    OfonoCallForwarding {
+        id: callForwarding
+        modemPath: sim.path
+        function updateSummary () {
+            var val;
+
+            // Clear the summary and exit if any of the values are unknown.
+            if (typeof voiceUnconditional === 'undefined' ||
+                typeof voiceBusy === 'undefined' ||
+                typeof voiceNoReply === 'undefined' ||
+                typeof voiceNotReachable === 'undefined') {
+                sim.setCallForwardingSummary('');
+                return;
+            }
+
+            if (voiceUnconditional) {
+                 val = i18n.tr("All calls");
+            } else if (voiceBusy || voiceNoReply || voiceNotReachable) {
+                val = i18n.tr("Some calls")
+            } else {
+                val = i18n.tr("Off")
+            }
+            sim.setCallForwardingSummary(val);
+        }
+
+        Component.onCompleted: updateSummary()
+        onVoiceUnconditionalChanged: updateSummary()
+        onVoiceBusyChanged: updateSummary()
+        onVoiceNoReplyChanged: updateSummary()
+        onVoiceNotReachableChanged: updateSummary()
+    }
+}

=== added file 'src/qml/SettingsPage/CallWaiting.qml'
--- src/qml/SettingsPage/CallWaiting.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/CallWaiting.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,108 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2013-2017 Canonical Ltd.
+ *
+ * Contact: Iain Lane <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import MeeGo.QOfono 0.2
+
+Page {
+    id: page
+    objectName: "callWaitingPage"
+    title: headerTitle
+    property var sim
+    property string headerTitle: i18n.tr("Call waiting")
+    property bool attached: sim.netReg.status === "registered" || sim.netReg.status === "roaming"
+
+    header: PageHeader {
+        id: pageHeader
+        title: page.title
+    }
+
+    OfonoCallSettings {
+        id: callSettings
+        modemPath: sim.path
+        onVoiceCallWaitingChanged: {
+            callWaitingIndicator.running = false;
+        }
+        onGetPropertiesFailed: {
+            console.warn('callSettings, onGetPropertiesFailed');
+            callWaitingIndicator.running = false;
+        }
+        onVoiceCallWaitingComplete: {
+            //When the property change is complete, the value of checked should always be in sync with serverChecked 
+            callWaitingSwitch.checked = callWaitingSwitch.serverChecked
+            /* Log some additional output to help debug when things don't work */
+            console.warn('callSettings, onVoiceCallWaitingComplete modem: ' + modemPath + ' success: ' + success + ' ' + voiceCallWaiting);
+            callWaitingIndicator.running = false;
+        }
+    }
+
+    ActivityIndicator {
+        id: callWaitingIndicator
+        running: true
+        visible: running && attached
+    }
+
+    Switch {
+        id: callWaitingSwitch
+        objectName: "callWaitingSwitch"
+        visible: !callWaitingIndicator.running
+        enabled: callSettings.ready && attached
+        property bool serverChecked: callSettings.voiceCallWaiting !== "disabled"
+        onServerCheckedChanged: checked = serverChecked
+        Component.onCompleted: checked = serverChecked
+        onTriggered: {
+            callWaitingIndicator.running = true;
+            if (checked)
+                callSettings.voiceCallWaiting = "enabled";
+            else
+                callSettings.voiceCallWaiting = "disabled";
+        }
+    }
+
+    Column {
+        anchors.fill: parent
+
+        ListItem.Standard {
+            id: callWaitingItem
+            text: i18n.tr("Call waiting")
+            control: callWaitingIndicator.running ?
+                     callWaitingIndicator : callWaitingSwitch
+        }
+
+        ListItem.Base {
+            height: textItem.height + units.gu(2)
+            Label {
+                id: textItem
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                    verticalCenter: parent.verticalCenter
+                }
+
+                text: i18n.tr("Lets you answer or start a new call while on another call, and switch between them")
+                horizontalAlignment: Text.AlignHCenter
+                wrapMode: Text.WordWrap
+            }
+            showDivider: false
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/KeyboardRectangle.qml'
--- src/qml/SettingsPage/KeyboardRectangle.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/KeyboardRectangle.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2015-2017 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/>.
+ */
+
+import QtQuick 2.4
+
+Item {
+    id: keyboardRect
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: parent.bottom
+    height: Qt.inputMethod.visible ? Qt.inputMethod.keyboardRectangle.height : 0
+
+    Behavior on height {
+        NumberAnimation {
+            duration: 300
+            easing.type: Easing.InOutQuad
+        }
+    }
+
+    states: [
+        State {
+            name: "hidden"
+            when: keyboardRect.height == 0
+        },
+        State {
+            name: "shown"
+            when: keyboardRect.height == Qt.inputMethod.keyboardRectangle.height
+        }
+    ]
+
+    function recursiveFindFocusedItem(parent) {
+        if (parent.activeFocus) {
+            return parent;
+        }
+
+        for (var i in parent.children) {
+            var child = parent.children[i];
+            if (child.activeFocus) {
+                return child;
+            }
+
+            var item = recursiveFindFocusedItem(child);
+
+            if (item != null) {
+                return item;
+            }
+        }
+
+        return null;
+    }
+
+    Connections {
+        target: Qt.inputMethod
+
+        onVisibleChanged: {
+            if (!Qt.inputMethod.visible) {
+                var focusedItem = recursiveFindFocusedItem(keyboardRect.parent);
+                if (focusedItem != null) {
+                    focusedItem.focus = false;
+                }
+            }
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/MultiSim.qml'
--- src/qml/SettingsPage/MultiSim.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/MultiSim.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2014-2017 Canonical Ltd
+ *
+ * This program 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.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.4
+import GSettings 1.0
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Column {
+
+    property var sims
+
+    Repeater {
+        model: sims
+
+        Column {
+
+            anchors { left: parent.left; right: parent.right }
+
+            SettingsItemTitle { text: sims[index].title }
+
+            ListItem.Standard {
+                objectName: "callWaitSim" + index
+                text: i18n.tr("Call waiting")
+                progression: true
+                onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {
+                    sim: sims[index],
+                    headerTitle: sims[index].title
+                })
+            }
+
+            ListItem.SingleValue {
+                objectName: "callFwdSim" + index
+                text: i18n.tr("Call forwarding")
+                progression: true
+                value: sims[index].getCallForwardingSummary()
+                onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {
+                    sim: sims[index],
+                    headerTitle: sims[index].title
+                })
+            }
+
+            ListItem.Standard {
+                objectName: "simServicesSim" + index
+                text: i18n.tr("Services")
+                progression: true
+                enabled: {
+                    var num;
+                    var map = sims[index].simMng.serviceNumbers;
+                    var nums = false;
+                    for(num in map) {
+                        if (map.hasOwnProperty(num)) {
+                            nums = true;
+                            break;
+                        }
+                    }
+                    return sims[index].simMng.present && nums;
+                }
+                showDivider: false
+                onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"), {
+                    carrierString: sims[index].netReg.name,
+                    sim: sims[index],
+                    headerTitle: sims[index].title
+                })
+            }
+
+            ListItem.Divider {
+                visible: index !== (sims.length - 1)
+            }
+
+            Binding {
+                target: sims[index]
+                property: "name"
+                value: phoneSettings.simNames[sims[index]]
+            }
+        }
+    }
+
+    GSettings {
+        id: phoneSettings
+        schema.id: "com.ubuntu.phone"
+        Component.onCompleted: {
+            // set default names
+            var simNames = phoneSettings.simNames;
+            var m0 = sims[0].path
+            var m1 = sims[1].path
+            if (!simNames[m0]) {
+                simNames[m0] = "SIM 1";
+            }
+            if (!simNames[m1]) {
+                simNames[m1] = "SIM 2";
+            }
+            phoneSettings.simNames = simNames;
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/NoSims.qml'
--- src/qml/SettingsPage/NoSims.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/NoSims.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2014-2017 Canonical Ltd
+ *
+ * This program 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.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Column {
+
+    ListItem.Standard {
+        text: i18n.tr("Call forwarding")
+        progression: true
+        enabled: false
+    }
+
+    ListItem.Standard {
+        text: i18n.tr("Call waiting")
+        progression: true
+        enabled: false
+    }
+
+    ListItem.Divider {}
+
+    ListItem.Standard {
+        text: i18n.tr("Services")
+        progression: true
+        enabled: false
+    }
+}

=== added file 'src/qml/SettingsPage/Ofono.qml'
--- src/qml/SettingsPage/Ofono.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/Ofono.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014-2017 Canonical Ltd
+ *
+ * This program 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.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.4
+import GSettings 1.0
+import MeeGo.QOfono 0.2
+
+Item {
+    property alias netReg: netReg
+    property alias simMng: simMng
+    property alias present: simMng.present
+
+    property string path
+    property string name
+    property string title: {
+        var number = simMng.subscriberNumbers[0] || simMng.subscriberIdentity;
+        return name + (number ? " (" + number + ")" : "");
+    }
+
+    OfonoNetworkRegistration {
+        id: netReg
+        modemPath: path
+    }
+
+    OfonoSimManager {
+        id: simMng
+        modemPath: path
+    }
+
+    function setCallForwardingSummary (val) {
+        var tmp = {};
+        var fwdSum = settings.callforwardingSummaries;
+        for (var k in fwdSum){
+            if (fwdSum.hasOwnProperty(k)) {
+                tmp[k] = fwdSum[k];
+            }
+        }
+        // Prefer IMSI to identify the SIM, use ICCID if IMSI is not available.
+        tmp[simMng.subscriberIdentity || simMng.CardIdentifier] = val;
+        settings.callforwardingSummaries = tmp;
+    }
+
+    function getCallForwardingSummary () {
+        // Use either IMSI or ICCID to identify the SIM.
+        var sid = simMng.subscriberIdentity || simMng.CardIdentifier;
+        return settings.callforwardingSummaries[sid] || '';
+    }
+
+    GSettings {
+        id: settings
+        schema.id: "com.ubuntu.touch.system-settings"
+    }
+}

=== added file 'src/qml/SettingsPage/OnlineAccountsHelper.qml'
--- src/qml/SettingsPage/OnlineAccountsHelper.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/OnlineAccountsHelper.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,96 @@
+/*
+ * 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/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.OnlineAccounts 0.1
+import Ubuntu.OnlineAccounts.Client 0.1
+import Ubuntu.Components.Popups 1.3
+
+Item {
+    id: root
+
+    property var dialogInstance: null
+    readonly property int count: accountsModel.count
+
+    function run(){
+        if (!root.dialogInstance) {
+            root.dialogInstance = PopupUtils.open(dialog)
+        }
+    }
+
+    ProviderModel {
+        id: accountsModel
+
+        applicationId: "dialer-app"
+    }
+
+    Component {
+        id: dialog
+        Dialog {
+            id: dialogue
+            title: "Online Accounts"
+            text: i18n.tr("Pick an account to create.")
+
+            ScrollView {
+                width: dialog.width
+                height: Math.min(listView.count, 3) * units.gu(7)
+
+                ListView {
+                    id: listView
+
+                    anchors.fill: parent
+                    clip: true
+                    model: accountsModel
+                    delegate: ListItem {
+                        ListItemLayout {
+                            title.text: model.displayName
+
+                            Image {
+                                SlotsLayout.position: SlotsLayout.First
+                                source: "image://theme/" + model.iconName
+                                width: units.gu(5)
+                                height: width
+                            }
+                        }
+                        onClicked: {
+                            listView.enabled = false
+                            setup.providerId = model.providerId
+                            setup.exec()
+                        }
+                    }
+                }
+            }
+            Button {
+                text: i18n.tr("Cancel")
+                onClicked: PopupUtils.close(dialogue)
+            }
+
+            Component.onDestruction: {
+                root.dialogInstance  = null
+            }
+        }
+    }
+
+    Setup {
+        id: setup
+        applicationId: "dialer-app"
+        providerId: "telephony-sip"
+        onFinished: {
+            PopupUtils.close(root.dialogInstance)
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/ServiceInfo.qml'
--- src/qml/SettingsPage/ServiceInfo.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/ServiceInfo.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,133 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2013-2017 Canonical Ltd.
+ *
+ * Contact: Sebastien Bacher <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.History 0.1
+import "dateUtils.js" as DateUtils
+
+Page {
+    id: page
+    property var sim
+    property string serviceName
+    property string serviceNumber
+    property string lastTimestamp
+    title: serviceName
+
+    header: PageHeader {
+        id: pageHeader
+        title: page.title
+    }
+
+    HistoryEventModel {
+        id: historyEventModel
+        type: HistoryThreadModel.EventTypeVoice
+        sort: HistorySort {
+            sortField: "timestamp"
+            sortOrder: HistorySort.DescendingOrder
+        }
+
+        property string phoneNumber: serviceNumber
+        onCountChanged: lastTimestamp = historyEventModel.get(0).timestamp
+
+        filter: HistoryUnionFilter {
+            // FIXME: this is not the best API for this case, but will be changed later
+            HistoryIntersectionFilter {
+                HistoryFilter {
+                    property string threadId: historyEventModel.threadIdForParticipants("ofono/ofono/account0",
+                                                                                        HistoryThreadModel.EventTypeVoice,
+                                                                                        [historyEventModel.phoneNumber],
+                                                                                        HistoryThreadModel.MatchPhoneNumber);
+                    filterProperty: "threadId"
+                    filterValue: threadId != "" ? threadId : "something that won't match"
+                }
+                HistoryFilter {
+                    filterProperty: "accountId"
+                    filterValue: "ofono/ofono/account0"
+                }
+            }
+
+            HistoryIntersectionFilter {
+                HistoryFilter {
+                    property string threadId: historyEventModel.threadIdForParticipants("ofono/ofono/account1",
+                                                                                        HistoryThreadModel.EventTypeVoice,
+                                                                                        [historyEventModel.phoneNumber],
+                                                                                        HistoryThreadModel.MatchPhoneNumber);
+                    filterProperty: "threadId"
+                    filterValue: threadId != "" ? threadId : "something that won't match"
+                }
+                HistoryFilter {
+                    filterProperty: "accountId"
+                    filterValue: "ofono/ofono/account1"
+                }
+            }
+        }
+    }
+
+    Column {
+        anchors {
+            left: parent.left
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+        }
+
+        ListItem.Base {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            height: lastCalledCol.height + units.gu(6)
+            Column {
+                id: lastCalledCol
+                anchors.left: parent.left
+                anchors.right: parent.right
+                height: childrenRect.height
+                spacing: units.gu(2)
+
+                Icon {
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    name: "contact"
+                    width: 144
+                    height: width
+                }
+
+                Label {
+                    id: calledLabel
+                    objectName: "calledLabel"
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    visible: lastTimestamp
+                    text: i18n.tr("Last called %1").arg(DateUtils.formatFriendlyDate(lastTimestamp))
+                }
+            }
+        }
+    }
+
+    ListItem.SingleControl {
+        anchors.bottom: parent.bottom
+        control: Button {
+            width: parent.width - units.gu(4)
+            text: i18n.tr("Call")
+            onClicked: {
+                var account = mainView.accountForModem(sim.path)
+                var accountId = account ? account.accountId : null
+                mainView.populateDialpad(serviceNumber, accountId)
+            }
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/Services.qml'
--- src/qml/SettingsPage/Services.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/Services.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,74 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2013 Canonical Ltd.
+ *
+ * Contact: Sebastien Bacher <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Page {
+    id: root
+    objectName: "servicesPage"
+    title: headerTitle
+    property string carrierString
+    property variant sim
+    property var names: []
+
+    // TRANSLATORS: %1 is the name of the (network) carrier
+    property string headerTitle: i18n.tr("%1 Services").arg(carrierString)
+
+    header: PageHeader {
+        id: pageHeader
+        title: root.title
+    }
+
+    Component.onCompleted: {
+        var keys = [];
+        for (var x in sim.simMng.serviceNumbers) {
+            keys.push(x);
+        }
+        names = keys;
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+                            Flickable.DragAndOvershootBounds :
+                            Flickable.StopAtBounds
+        /* Set the direction to workaround
+           https://bugreports.qt-project.org/browse/QTBUG-31905 otherwise the UI
+           might end up in a situation where scrolling doesn't work */
+        flickableDirection: Flickable.VerticalFlick
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+            Repeater {
+                model: names
+
+                ListItem.Standard {
+                    progression: true
+                    text: modelData
+                    onClicked: pageStack.push(Qt.resolvedUrl("ServiceInfo.qml"), {serviceName: modelData, serviceNumber: sim.simMng.serviceNumbers[modelData], sim: sim})
+                }
+            }
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/SettingsItemTitle.qml'
--- src/qml/SettingsPage/SettingsItemTitle.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/SettingsItemTitle.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,44 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2013-2017 Canonical Ltd.
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+
+Item {
+    property alias text: label.text
+    anchors {
+        left: parent.left
+        right: parent.right
+    }
+    height: units.gu(6)
+
+    Label {
+        id: label
+        anchors {
+            top: parent.top
+            topMargin: units.gu(3)
+            right: parent.right
+            rightMargin: units.gu(2)
+            bottom: parent.bottom
+            left: parent.left
+            leftMargin: units.gu(2)
+        }
+        fontSize: "small"
+        opacity: 0.75
+    }
+}

=== added file 'src/qml/SettingsPage/SettingsPage.qml'
--- src/qml/SettingsPage/SettingsPage.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/SettingsPage.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,158 @@
+/*
+ * This file is part of dialer-app
+ *
+ * Copyright (C) 2013-2017 Canonical Ltd.
+ *
+ * Contact: Iain Lane <[e-mail]>
+ *
+ * This program 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, 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
+import Ubuntu.Components.ListItems 1.3 as ListItem
+import Ubuntu.Telephony 0.1
+
+Page {
+    id: settingsPage
+    objectName: "phonePage"
+    title: i18n.tr("Settings")
+    flickable: flick
+
+    property var modemAccounts: telepathyHelper.phoneAccounts.displayed
+    property var sims: []
+
+    function updateSims() {
+        var component = Qt.createComponent("Ofono.qml");
+
+        // remove previous objects
+        sims.forEach(function (sim) {
+            sim.destroy();
+        })
+
+        var result = []
+        for (var i in settingsPage.modemAccounts) {
+            var sim = component.createObject(settingsPage, {
+                path: settingsPage.modemAccounts[i].modemName
+            })
+            result.push(sim)
+        }
+        sims = result
+    }
+
+    header: PageHeader {
+        id: pageHeader
+        title: settingsPage.title
+        flickable: flick
+    }
+
+    states: [
+        State {
+            name: "noSim"
+            StateChangeScript {
+                script: loader.setSource("NoSims.qml")
+            }
+            when: sims.length === 0
+        },
+        State {
+            name: "singleSim"
+            StateChangeScript {
+                script: loader.setSource("SingleSim.qml", {
+                    sim: sims[0]
+                })
+            }
+            when: sims.length === 1
+        },
+        State {
+            name: "multiSim"
+            StateChangeScript {
+                script: loader.setSource("MultiSim.qml", {
+                    sims: sims
+                })
+            }
+            when: sims.length > 1
+        }
+    ]
+
+    onModemAccountsChanged: updateSims()
+
+    Flickable {
+        id: flick
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > settingsPage.height) ?
+            Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+        Column {
+            anchors { left: parent.left; right: parent.right }
+
+            Loader {
+                id: loader
+                anchors { left: parent.left; right: parent.right }
+            }
+
+            ListItem.Standard {
+                control: Switch {
+                    objectName: "dialpadSounds"
+                    property bool serverChecked: telepathyHelper.dialpadSoundsEnabled
+                    onServerCheckedChanged: checked = serverChecked
+                    Component.onCompleted: checked = serverChecked
+                    onTriggered: telepathyHelper.dialpadSoundsEnabled = checked
+                }
+                text: i18n.tr("Dialpad tones")
+            }
+
+            ListItem.Standard {
+                id: addAccount
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+                text: i18n.tr("Add an online account")
+                progression: true
+                onClicked: onlineAccountHelper.item.run()
+                enabled: (onlineAccountHelper.status === Loader.Ready) && (onlineAccountHelper.item.count > 0)
+            }
+
+            Repeater {
+                model: telepathyHelper.voiceAccounts.all
+
+                Loader {
+                    id: accountPropertiesLoader
+                    anchors {
+                        left: parent.left
+                        right: parent.right
+                        margins: units.gu(1)
+                    }
+                    height: childrenRect.height
+                    source: Qt.resolvedUrl("./AccountSettings/" + modelData.protocolInfo.name + ".qml")
+
+                    onStatusChanged: {
+                        if (status == Loader.Ready) {
+                            item.account = modelData
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    Loader {
+        id: onlineAccountHelper
+
+        anchors.fill: parent
+        asynchronous: true
+        source: Qt.resolvedUrl("OnlineAccountsHelper.qml")
+    }
+}

=== added file 'src/qml/SettingsPage/SettingsTextField.qml'
--- src/qml/SettingsPage/SettingsTextField.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/SettingsTextField.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,29 @@
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.Themes.Ambiance 0.1
+
+TextField {
+    id: textField
+    horizontalAlignment: TextInput.AlignRight
+    font {
+        pixelSize: units.dp(18)
+        weight: Font.Light
+        family: "Ubuntu"
+    }
+    color: "#AAAAAA"
+    maximumLength: 20
+    focus: true
+    style: TextFieldStyle {
+        overlaySpacing: units.gu(0.5)
+        frameSpacing: 0
+        background: Rectangle {
+            property bool error: (textField.hasOwnProperty("errorHighlight") &&
+                                  textField.errorHighlight &&
+                                  !textField.acceptableInput)
+            onErrorChanged: error ? theme.palette.normal.negative : color
+            color: Theme.palette.normal.background
+            anchors.fill: parent
+            visible: textField.activeFocus
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/SingleSim.qml'
--- src/qml/SettingsPage/SingleSim.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/SingleSim.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014-2017 Canonical Ltd
+ *
+ * This program 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.
+ *
+ * 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/>.
+ *
+ * Authors:
+ * Ken Vandine <[e-mail]>
+ * Jonas G. Drange <[e-mail]>
+ *
+*/
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Ubuntu.Components.ListItems 1.3 as ListItem
+
+Column {
+    property var sim
+    property string carrierName: sim ? sim.netReg.name : null
+    property string carrierString: carrierName ? carrierName : i18n.tr("SIM")
+
+    ListItem.Standard {
+        objectName: "callWait"
+        text: i18n.tr("Call waiting")
+        progression: true
+        onClicked: pageStack.push(Qt.resolvedUrl("CallWaiting.qml"), {sim: sim})
+    }
+
+    ListItem.SingleValue {
+        objectName: "callFwd"
+        text: i18n.tr("Call forwarding")
+        showDivider: false
+        progression: true
+        value: sim.getCallForwardingSummary()
+        onClicked: pageStack.push(Qt.resolvedUrl("CallForwarding.qml"), {sim: sim})
+    }
+
+    ListItem.Divider {}
+
+    ListItem.Standard {
+        objectName: "simServices"
+        // TRANSLATORS: %1 is the name of the (network) carrier
+        text: i18n.tr("%1 Services").arg(carrierString)
+        progression: true
+        showDivider: false
+        enabled: {
+            var num;
+            var map = sim.simMng.serviceNumbers;
+            var nums = false;
+            for(num in map) {
+                if (map.hasOwnProperty(num)) {
+                    nums = true;
+                    break;
+                }
+            }
+            return sim.simMng.present && nums;
+        }
+        onClicked: pageStack.push(Qt.resolvedUrl("Services.qml"),
+                                  {carrierString: carrierString, sim: sim})
+    }
+}

=== added file 'src/qml/SettingsPage/VCardParser.qml'
--- src/qml/SettingsPage/VCardParser.qml	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/VCardParser.qml	2017-04-05 17:09:12 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015-2017 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/>.
+ */
+
+import QtQuick 2.4
+import QtContacts 5.0
+
+QtObject {
+    id: root
+
+    property string vCardUrl
+    property alias contacts: contactsModel.contacts
+    property var _model
+
+    signal vcardParsed(int error)
+
+    function clearModel()
+    {
+        if (contactsModel.contacts.length === 0)
+            return;
+
+        var ids = []
+        for(var i=0, iMax=contactsModel.contacts.length; i < iMax; i++) {
+            ids.push(contactsModel.contacts[i].contactId)
+        }
+        contactsModel.removeContacts(ids)
+    }
+
+    _model: ContactModel {
+        id: contactsModel
+
+        manager: "memory"
+
+        onImportCompleted: vcardParsed(error)
+    }
+
+    onVCardUrlChanged: {
+        if (vCardUrl.length > 0) {
+            clearModel()
+            contactsModel.importContacts(vCardUrl)
+        }
+    }
+}

=== added file 'src/qml/SettingsPage/callForwardingUtils.js'
--- src/qml/SettingsPage/callForwardingUtils.js	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/callForwardingUtils.js	2017-04-05 17:09:12 +0000
@@ -0,0 +1,126 @@
+
+/**
+ * Handle the user's intention when it checks the check mark
+ * associated with this forwarding item.
+ *
+ * @param {Boolean} Value of check
+*/
+function checked (value) {
+    if (value) {
+        if (item.cachedRuleValue) {
+            requestRule(item.cachedRuleValue);
+        } else {
+            d._editing = true;
+        }
+    } else {
+        if (d._editing) {
+            d._editing = false;
+        } else {
+            requestRule('');
+        }
+    }
+}
+
+/**
+ * Request that the rule be changed on the backend.
+ *
+ * @param {String} new rule value
+ * @return {Boolean} whether or not we requested a change
+ */
+function requestRule (value) {
+    value = normalizePhoneNumber(value);
+    if (value === item.callForwarding[item.rule]) {
+        console.warn('Value did not change.');
+        return false;
+    }
+
+    item.callForwarding[item.rule] = value;
+    d._pending = true;
+    return true;
+}
+
+/**
+ * Handler for when the component enter or leaves editing mode.
+ */
+function editingChanged () {
+     if (d._editing) {
+        item.enteredEditMode();
+     } else {
+         item.leftEditMode();
+     }
+}
+
+/**
+ * Handler for when the rule changes on the backend.
+ *
+ * @param {String} the new property
+ */
+function ruleChanged (property) {
+    check.checked = callForwarding[rule] !== "";
+}
+
+/**
+ * Handler for when the backend responds.
+ *
+ * @param {Boolean} whether or not the backend succeeded
+ */
+function ruleComplete (success) {
+    d._pending = false;
+    d._editing = false;
+    if (!success) {
+        d._failed = true;
+    }
+}
+
+/**
+ * Handler for when the rule ready changes.
+ */
+function ruleReadyChanged () {
+    d._pending = !callForwarding.ready;
+}
+
+/**
+ * Scroll something into view.
+ *
+ * @param {QtObject} item to scroll to.
+ */
+function show(item) {
+    if (!item) {
+        return;
+    }
+    page.activeItem = item;
+
+    var position = flick.contentItem.mapFromItem(item, 0, page.activeItem.y);
+
+    // check if the item is already visible
+    var bottomY = flick.contentY + flick.height;
+    var itemBottom = position.y + item.height + units.gu(2); // extra margin
+    if (position.y >= flick.contentY && itemBottom <= bottomY) {
+        return;
+    }
+
+    // if it is not, try to scroll and make it visible
+    var targetY = itemBottom - flick.height;
+    if (targetY >= 0 && position.y) {
+        flick.contentY = targetY;
+    } else if (position.y < flick.contentY) {
+        // if it is hidden at the top, also show it
+        flick.contentY = position.y;
+    }
+    flick.returnToBounds();
+}
+
+/**
+ * Normalizes a phone number.
+ *
+ * TODO(jgdx): Remove this and replace it with libphonenumber
+ *
+ * @param {String} number to normalize
+ * @return {String} normalized number
+ */
+function normalizePhoneNumber(identifier) {
+    var regexp = new RegExp('[()/-]', 'g');
+    var finalNumber = identifier.replace(/\s+/g, '');
+    finalNumber = finalNumber.replace(regexp, '');
+    return finalNumber;
+}

=== added file 'src/qml/SettingsPage/dateUtils.js'
--- src/qml/SettingsPage/dateUtils.js	1970-01-01 00:00:00 +0000
+++ src/qml/SettingsPage/dateUtils.js	2017-04-05 17:09:12 +0000
@@ -0,0 +1,69 @@
+/*
+ * 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/>.
+ */
+
+function areSameDay(date1, date2) {
+    return date1.getFullYear() == date2.getFullYear()
+        && date1.getMonth() == date2.getMonth()
+        && date1.getDate() == date2.getDate()
+}
+
+function formatLogDate(timestamp) {
+    var today = new Date()
+    var date = new Date(timestamp)
+    if (areSameDay(today, date)) {
+        return Qt.formatTime(timestamp, Qt.DefaultLocaleShortDate)
+    } else {
+        return Qt.formatDateTime(timestamp, Qt.DefaultLocaleShortDate)
+    }
+}
+
+function friendlyDay(timestamp) {
+    var date = new Date(timestamp);
+    var today = new Date();
+    var yesterday = new Date();
+    yesterday.setDate(today.getDate()-1);
+    if (areSameDay(today, date)) {
+        return i18n.tr("Today");
+    } else if (areSameDay(yesterday, date)) {
+        return i18n.tr("Yesterday");
+    } else {
+        return Qt.formatDate(date, Qt.DefaultLocaleShortDate);
+    }
+}
+
+function formatFriendlyDate(timestamp) {
+    return Qt.formatTime(timestamp, Qt.DefaultLocaleShortDate) + " - " + friendlyDay(timestamp);
+}
+
+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"));
+
+    if (hours > 0) {
+        text = i18n.tr("%1 hour", "%1 hours", hours).arg(hours)
+    } else if (minutes > 0) {
+        text = i18n.tr("%1 min", "%1 mins", minutes).arg(minutes)
+    } else {
+        text = i18n.tr("%1 sec", "%1 secs", seconds).arg(seconds)
+    }
+
+    return text;
+}

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2016-10-19 11:45:45 +0000
+++ src/qml/dialer-app.qml	2017-04-05 17:09:12 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.4
 import Qt.labs.settings 1.0
 
 import Ubuntu.Components 1.3
@@ -410,11 +410,15 @@
             pageStackNormalMode.pop();
         }
 
-        if (pageStackNormalMode.currentPage && typeof(pageStackNormalMode.currentPage.dialNumber) != 'undefined') {
-            pageStackNormalMode.currentPage.dialNumber = number;
+        var dialerPage = pageStackNormalMode.currentPage
+        if (dialerPage && typeof(dialerPage.dialNumber) != 'undefined') {
+            dialerPage.dialNumber = number;
+            if (accountId) {
+                dialerPage.selectAccount(accountId)
+            }
 
-            if (pageStackNormalMode.currentPage.bottomEdgeItem) {
-                pageStackNormalMode.currentPage.bottomEdgeItem.collapse()
+            if (dialerPage.bottomEdgeItem) {
+                dialerPage.bottomEdgeItem.collapse()
             }
         }
     }
@@ -481,16 +485,27 @@
         PopupUtils.open(Qt.createComponent("Dialogs/SimLockedDialog.qml").createObject(mainView), mainView, properties)
     }
 
+    function accountForModem(modemName) {
+        var modemAccounts = telepathyHelper.phoneAccounts.displayed
+        for (var i in modemAccounts) {
+            if (modemAccounts[i].modemName == modemName) {
+                return modemAccounts[i]
+            }
+        }
+        return null
+    }
+
     Component.onCompleted: {
         i18n.domain = "dialer-app"
         i18n.bindtextdomain("dialer-app", i18nDirectory)
         pageStackNormalMode.push(Qt.createComponent("DialerPage/DialerPage.qml"))
 
         // when running in windowed mode, do not allow resizing
-        view.minimumWidth  = Qt.binding( function() { return implicitWidth * 0.9; } )
-        view.maximumWidth = Qt.binding( function() { return implicitWidth * 1.1; } )
-        view.minimumHeight = Qt.binding( function() { return implicitHeight * 0.9; } )
-        view.maximumHeight = Qt.binding( function() { return implicitHeight * 1.1; } )
+        view.minimumWidth  = units.gu(40)
+        view.minimumHeight = units.gu(52)
+
+//        view.maximumWidth = Qt.binding( function() { return implicitWidth * 3.0; } )
+//        view.maximumHeight = Qt.binding( function() { return implicitHeight * 3.0; } )
 
         // if there are calls, even if we don't have info about them yet, push the livecall view
         if (callManager.hasCalls) {