Merge lp:~tiagosh/dialer-app/fix-dtmf-long-press into lp:dialer-app

[Tiago Salem Herrmann]

- move MMI code to onKeyPressed()
- use onPressed() instead of onClicked()

- move MMI code to onKeyPressed()
- use onPressed() instead of onClicked()

-- Checklist --
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/dialer-app) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:213
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/359/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/130
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/130
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3084
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2429
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4327
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4327/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11062
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2010
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2698
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2698/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/359/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:214
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/361/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/132
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3121
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2449
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4365
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4365/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2719
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2719/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/361/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/dialer-app/fix-dtmf-long-press]

215. By Tiago Salem Herrmann on 2014-08-07

merge dial-tone branch

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:215
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-amd64-ci/135
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-utopic-i386-ci/135
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3178/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2501
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3192/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4423
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11153
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2771
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2771/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/dialer-app-ci/364/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the MR

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good and works as expected!

review: Approve

=== modified file 'src/qml/DialerPage/DialerPage.qml'
--- src/qml/DialerPage/DialerPage.qml	2014-08-07 14:59:35 +0000
+++ src/qml/DialerPage/DialerPage.qml	2014-08-07 14:59:35 +0000
@@ -102,18 +102,6 @@
         }
     }
 
-    onDialNumberChanged: {
-        if(checkUSSD(dialNumber)) {
-            // check for custom strings
-            if (dialNumber === "*#06#") {
-                dialNumber = ""
-                mainView.ussdResponseTitle = "IMEI"
-                mainView.ussdResponseText = ussdManager.serial(mainView.account.accountId)
-                PopupUtils.open(ussdResponseDialog)
-            }
-        }
-    }
-
     function accountIndex(account) {
         var index = -1;
         for (var i in telepathyHelper.accounts) {
@@ -289,6 +277,7 @@
 
         Keypad {
             id: keypad
+            showVoicemail: true
 
             anchors {
                 top: divider.bottom
@@ -297,11 +286,33 @@
             }
 
             onKeyPressed: {
+                callManager.playTone(label);
                 input.insert(input.cursorPosition, label)
-                callManager.playTone(label);
+                if(checkUSSD(dialNumber)) {
+                    // check for custom strings
+                    if (dialNumber === "*#06#") {
+                        dialNumber = ""
+                        mainView.ussdResponseTitle = "IMEI"
+                        mainView.ussdResponseText = ussdManager.serial(mainView.account.accountId)
+                        PopupUtils.open(ussdResponseDialog)
+                    }
+                }
+            }
+            onKeyPressAndHold: {
+                // we should only call voicemail if the keypad entry was empty,
+                // but as we add numbers when onKeyPressed is triggered, the keypad entry will be "1"
+                if (keycode == Qt.Key_1 && dialNumber == "1") {
+                    dialNumber = ""
+                    mainView.callVoicemail()
+                } else if (keycode == Qt.Key_0) {
+                    // replace 0 by +
+                    dialNumber = dialNumber.substring(0, dialNumber.length - 1)
+                    dialNumber += i18n.tr("+")
+                }
             }
         }
     }
+
     Item {
         id: footer
 

=== modified file 'src/qml/DialerPage/Keypad.qml'
--- src/qml/DialerPage/Keypad.qml	2014-07-23 16:10:36 +0000
+++ src/qml/DialerPage/Keypad.qml	2014-08-07 14:59:35 +0000
@@ -25,11 +25,13 @@
 
     property int keysWidth: units.gu(11)
     property int keysHeight: units.gu(8)
+    property bool showVoicemail: false
 
     width: keys.width
     height: keys.height
 
     signal keyPressed(int keycode, string label)
+    signal keyPressAndHold(int keycode, string label)
 
     Grid {
         id: keys
@@ -46,9 +48,9 @@
             height: keysHeight
             label: i18n.tr("1")
             keycode: Qt.Key_1
-            onClicked: keypad.keyPressed(keycode, label)
-            onPressAndHold: mainView.callVoicemail()
-            iconSource: "voicemail"
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
+            iconSource: showVoicemail ? "voicemail" : ""
         }
 
         KeypadButton {
@@ -58,7 +60,8 @@
             label: i18n.tr("2")
             sublabel: i18n.tr("ABC")
             keycode: Qt.Key_2
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -68,7 +71,8 @@
             label: i18n.tr("3")
             sublabel: i18n.tr("DEF")
             keycode: Qt.Key_3
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -78,7 +82,8 @@
             label: i18n.tr("4")
             sublabel: i18n.tr("GHI")
             keycode: Qt.Key_4
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -88,7 +93,8 @@
             label: i18n.tr("5")
             sublabel: i18n.tr("JKL")
             keycode: Qt.Key_5
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -98,7 +104,8 @@
             label: i18n.tr("6")
             sublabel: i18n.tr("MNO")
             keycode: Qt.Key_6
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -108,7 +115,8 @@
             label: i18n.tr("7")
             sublabel: i18n.tr("PQRS")
             keycode: Qt.Key_7
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -118,7 +126,8 @@
             label: i18n.tr("8")
             sublabel: i18n.tr("TUV")
             keycode: Qt.Key_8
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -128,7 +137,8 @@
             label: i18n.tr("9")
             sublabel: i18n.tr("WXYZ")
             keycode: Qt.Key_9
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -139,7 +149,8 @@
             corner: Qt.BottomLeftCorner
             label: i18n.tr("*")
             keycode: Qt.Key_Asterisk
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -150,8 +161,8 @@
             sublabel: i18n.tr("+")
             sublabelSize: "medium"
             keycode: Qt.Key_0
-            onClicked: keypad.keyPressed(keycode, label)
-            onPressAndHold: keypad.keyPressed(keycode, sublabel)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
 
         KeypadButton {
@@ -162,7 +173,8 @@
             corner: Qt.BottomRightCorner
             label: i18n.tr("#")
             keycode: Qt.Key_ssharp
-            onClicked: keypad.keyPressed(keycode, label)
+            onKeyPressed: keypad.keyPressed(keycode, label)
+            onPressAndHold: keypad.keyPressAndHold(keycode, label)
         }
     }
 }

=== modified file 'src/qml/DialerPage/KeypadButton.qml'
--- src/qml/DialerPage/KeypadButton.qml	2014-07-23 16:10:36 +0000
+++ src/qml/DialerPage/KeypadButton.qml	2014-08-07 14:59:35 +0000
@@ -32,6 +32,9 @@
     property int keycode
     property bool isCorner: false
     property int corner
+    property alias pressed: mouseArea.pressed
+ 
+    signal keyPressed()
 
     UbuntuShape {
         anchors.fill: parent
@@ -92,4 +95,12 @@
             height: units.gu(2)
         }
     }
+
+    // WORKAROUND: AbstractButton does not provide onPressed()
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onPressed: button.keyPressed()
+        onPressAndHold: button.pressAndHold()
+    }
 }