dialer-app

Merge lp:~boiko/dialer-app/live_call_behavior into lp:dialer-app

live_call_behavior
Merge into trunk

Proposed by Gustavo Pichorim Boiko on 2014-02-20

Status:

Superseded

Proposed branch:

lp:~boiko/dialer-app/live_call_behavior

Merge into:

lp:dialer-app

Diff against target:

443 lines (+45/-213)

9 files modified

debian/dialer-app.install (+0/-1)
src/qml/CMakeLists.txt (+0/-1)
src/qml/DialerPage/DialerPage.qml (+0/-4)
src/qml/LiveCallPage/LiveCall.qml (+32/-18)
src/qml/LiveCallPage/LiveCallKeypadButton.qml (+5/-5)
src/qml/VoicemailPage/CMakeLists.txt (+0/-7)
src/qml/VoicemailPage/VoicemailPage.qml (+0/-150)
src/qml/dialer-app.qml (+7/-24)
tests/autopilot/dialer_app/tests/test_logs.py (+1/-3)

To merge this branch:

bzr merge lp:~boiko/dialer-app/live_call_behavior

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-02-21
Tiago Salem Herrmann (community)		2014-02-20	Needs Fixing on 2014-02-21
Review via email: mp+207555@code.launchpad.net

This proposal has been superseded by a proposal from 2014-02-21.

Commit message

Improve the live call view behavior by addressing the following points:
- Start in the live call directly when there is an existing call (to avoid showing the dialpad for a short time before loading the live call view).
- Merge the voicemail view into the live call one. This addresses a problem that when you were on a voicemail call and got another call, there was no way to switch between them.

Description of the change

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-02-20:

I think you forgot to remove the comment.

129 + enabled: false //!isVoicemail

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2014-02-21:

> I think you forgot to remove the comment.
>
> 129 + enabled: false //!isVoicemail

That was actually added there on purpose, I will add a comment explaining why.

lp:~boiko/dialer-app/live_call_behavior updated on 2014-02-21

104. By Gustavo Pichorim Boiko on 2014-02-21: Remove VoicemailPage from the debian packaging.
105. By Gustavo Pichorim Boiko on 2014-02-21: Add a note on why the commented code was left there.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-02-21:

I think I found a bug:
Call voicemail, receive another call and put the voicemail call on hold.
With the new call in foreground enable and disable the keypad. Now switch to the voicemail call and then it is not possible to show the keypad anymore as the button is disabled.

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Tiago Salem Herrmann (tiagosh) wrote on 2014-02-21:

We should not trigger call() here if the voicemailNumber is empty, otherwise the livecall view will be displayed and after some seconds disappear because no call was actually created.

363 + call(callManager.voicemailNumber);

review: Needs Fixing

lp:~boiko/dialer-app/live_call_behavior updated on 2014-02-21

106. By Gustavo Pichorim Boiko on 2014-02-21: Make sure to always show the dialpad for voicemail calls.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-21:

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

review: Needs Fixing (continuous-integration)

lp:~boiko/dialer-app/live_call_behavior updated on 2014-02-21

107. By Gustavo Pichorim Boiko on 2014-02-21: Merge the fixes for the test that involves the messaging app.
108. By Gustavo Pichorim Boiko on 2014-02-21: Make sure the phonenumber is not empty before calling.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Gustavo Pichorim Boiko

Ishan Joshi

Ubuntu Phablet Team

 === modified file 'debian/dialer-app.install'
 --- debian/dialer-app.install	2014-01-14 04:04:23 +0000
 +++ debian/dialer-app.install	2014-02-21 19:42:08 +0000
@@ -5,7 +5,6 @@
  usr/share/dialer-app/LiveCallPage
  usr/share/dialer-app/HistoryPage
  usr/share/dialer-app/DialerPage
--usr/share/dialer-app/VoicemailPage
  usr/share/dialer-app/ContactsPage
  usr/share/dialer-app/assets
  usr/bin/*dialer-app*
 === modified file 'src/qml/CMakeLists.txt'
 --- src/qml/CMakeLists.txt	2013-07-31 17:27:42 +0000
 +++ src/qml/CMakeLists.txt	2014-02-21 19:42:08 +0000
@@ -11,5 +11,4 @@
  add_subdirectory(DialerPage)
  add_subdirectory(HistoryPage)
  add_subdirectory(LiveCallPage)
--add_subdirectory(VoicemailPage)
  add_subdirectory(ContactsPage)
 === modified file 'src/qml/DialerPage/DialerPage.qml'
 --- src/qml/DialerPage/DialerPage.qml	2013-10-08 13:21:55 +0000
 +++ src/qml/DialerPage/DialerPage.qml	2014-02-21 19:42:08 +0000
@@ -29,10 +29,6 @@
      property alias dialNumber: keypadEntry.value
      property alias input: keypadEntry.input
--    function isVoicemailActive() {
--        return mainView.isVoicemailActive();
--    }
--
      tools: ToolbarItems {
          opened: false
          locked: true
 === modified file 'src/qml/LiveCallPage/LiveCall.qml'
 --- src/qml/LiveCallPage/LiveCall.qml	2014-01-16 20:27:58 +0000
 +++ src/qml/LiveCallPage/LiveCall.qml	2014-02-21 19:42:08 +0000
@@ -36,9 +36,16 @@
      property bool onHold: call ? call.held : false
      property bool isSpeaker: call ? call.speaker : false
      property bool isMuted: call ? call.muted : false
--    property bool dtmfVisible: false
++    property bool dtmfVisible: call ? call.voicemail : false
++    property bool isVoicemail: call ? call.voicemail : false
      property string phoneNumberSubTypeLabel: ""
      Component.onDestruction: mainView.switchToCallLogView()
++
++    onCallChanged: {
++        // reset the DTMF keypad visibility status
++        dtmfVisible = (call && call.voicemail);
++    }
++
      Timer {
          id: callWatcher
          interval: 10000
@@ -96,8 +103,18 @@
          when: liveCall.header && liveCall.active
+     }
--    // TRANSLATORS: %1 is the duration of the call
--    title: dtmfLabelHelper.text !== "" ? dtmfLabelHelper.text : contactWatcher.alias != "" ? contactWatcher.alias : contactWatcher.phoneNumber
++    title: {
++        if (dtmfLabelHelper.text !== "") {
++            return dtmfLabelHelper.text;
++        } else if (isVoicemail) {
++            return i18n.tr("Voicemail");
++        } else if (contactWatcher.alias != "") {
++            return contactWatcher.alias;
++        } else {
++            return contactWatcher.phoneNumber;
++        }
++    }
++
      tools: ToolbarItems {
          opened: false
          locked: true
@@ -170,7 +187,7 @@
          fillMode: Image.PreserveAspectCrop
          // FIXME: use something different than a hardcoded path of a unity8 asset
--        source: contactWatcher.avatar != "" ? contactWatcher.avatar : "../assets/live_call_background.png"
++        source: (isVoicemail || contactWatcher.avatar == "") ? "../assets/live_call_background.png" : contactWatcher.avatar
          anchors {
              top: topPanel.bottom
              left: parent.left
@@ -193,7 +210,11 @@
      Item {
          id: topPanel
          clip: true
--        height: contactWatcher.isUnknown ? 0 : units.gu(5)
++        height: (isVoicemail || contactWatcher.isUnknown) ? 0 : units.gu(5)
++        Behavior on height {
++            UbuntuNumberAnimation { }
++        }
++
          anchors {
              top: parent.top
              left: parent.left
@@ -229,17 +250,6 @@
              bottom: buttonsArea.top
+         }
--        // FIXME: re-enable the keypad entry once design decides where to place it
--        /*KeypadEntry {
--            id: keypadEntry
--
--            anchors.centerIn: parent
--            placeHolder: liveCall.number
--            placeHolderPixelFontSize: units.dp(43)
--            focus: true
--            input.readOnly: true
--        }*/
--
          Keypad {
              id: keypad
@@ -248,7 +258,6 @@
              anchors.bottomMargin: units.gu(2)
              anchors.horizontalCenter: parent.horizontalCenter
              onKeyPressed: {
--                //keypadEntry.value += label
                  if (call) {
                      dtmfEntry += label
                      call.sendDTMF(label)
@@ -331,6 +340,7 @@
              LiveCallKeypadButton {
                  objectName: "muteButton"
                  iconSource: selected ? "microphone-mute" : "microphone"
++                enabled: !isVoicemail
                  selected: liveCall.isMuted
                  iconWidth: units.gu(3)
                  iconHeight: units.gu(3)
@@ -344,6 +354,7 @@
              LiveCallKeypadButton {
                  objectName: "pauseStartButton"
                  iconSource: selected ? "media-playback-start" : "media-playback-pause"
++                enabled: !isVoicemail
                  selected: liveCall.onHold
                  iconWidth: units.gu(3)
                  iconHeight: units.gu(3)
@@ -382,7 +393,9 @@
              iconSource: "contact"
              iconWidth: units.gu(4)
              iconHeight: units.gu(4)
--            opacity: 0.2
++            // this button is fully disabled for now, but when it gets enabled again, we need to remember
++            // to still disable it while calling the voicemail
++            enabled: false //!isVoicemail
              anchors {
                  verticalCenter: hangupButton.verticalCenter
@@ -406,6 +419,7 @@
              iconSource: "keypad"
              iconWidth: units.gu(4)
              iconHeight: units.gu(4)
++            enabled: !isVoicemail
              anchors {
                  verticalCenter: hangupButton.verticalCenter
 === modified file 'src/qml/LiveCallPage/LiveCallKeypadButton.qml'
 --- src/qml/LiveCallPage/LiveCallKeypadButton.qml	2013-09-27 17:35:35 +0000
 +++ src/qml/LiveCallPage/LiveCallKeypadButton.qml	2014-02-21 19:42:08 +0000
@@ -27,15 +27,15 @@
      width: units.gu(7)
      height: units.gu(7)
++    opacity: enabled ? 1.0 : 0.2
++
++    Behavior on opacity {
++        UbuntuNumberAnimation { }
++    }
      property int iconWidth: 0
      property int iconHeight: 0
--    /*BorderImage {
--        anchors.fill: parent
--        source: (selected || pressed) ? "../assets/dialer_pad_bg_pressed.png" : "../assets/dialer_pad_bg.png"
--    }*/
--
      Icon {
          id: icon
          anchors.centerIn: parent
 === removed directory 'src/qml/VoicemailPage'
 === removed file 'src/qml/VoicemailPage/CMakeLists.txt'
 --- src/qml/VoicemailPage/CMakeLists.txt	2013-07-31 17:27:42 +0000
 +++ src/qml/VoicemailPage/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
--file(GLOB VOICEMAIL_QML_JS_FILES *.qml *.js)
--
--# make the files visible on qtcreator
--add_custom_target(dialer_voicemail_QMlFiles ALL SOURCES ${VOICEMAIL_QML_JS_FILES})
--
--install(FILES ${VOICEMAIL_QML_JS_FILES} DESTINATION ${DIALER_APP_DIR}/VoicemailPage)
--
 === removed file 'src/qml/VoicemailPage/VoicemailPage.qml'
 --- src/qml/VoicemailPage/VoicemailPage.qml	2013-09-26 21:39:16 +0000
 +++ src/qml/VoicemailPage/VoicemailPage.qml	1970-01-01 00:00:00 +0000
@@ -1,150 +0,0 @@
--/*
-- * Copyright 2012-2013 Canonical Ltd.
-- *
-- * This file is part of phone-app.
-- *
-- * phone-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.
-- *
-- * phone-app is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- */
--
--import QtQuick 2.0
--import Ubuntu.Components 0.1
--import "../DialerPage"
--import "../LiveCallPage"
--
--Page {
--    id: voicemail
--
--    property variant contact
--    property QtObject call: callManager.foregroundCall
--    property string number: callManager.voicemailNumber
--    Component.onDestruction: mainView.switchToCallLogView()
--    Timer {
--        id: callWatcher
--        interval: 10000
--        repeat: false
--        running: true
--        onTriggered: {
--            if (!call) {
--                // TODO: notify about failed call
--                pageStack.pop()
--            }
--        }
--    }
--
--    title: i18n.tr("Voicemail")
--
--    function isVoicemailActive() {
--        return mainView.isVoicemailActive();
--    }
--
--    function endCall() {
--        if (call) {
--            call.endCall();
--        }
--    }
--
--    Item {
--        id: container
--
--        anchors.fill: parent
--
--        Item {
--            id: body
--
--            anchors.fill: parent
--
--            Label {
--                id: number
--
--                anchors.horizontalCenter: parent.horizontalCenter
--                anchors.bottom: stopWatch.top
--                anchors.topMargin: units.gu(0.5)
--                text: voicemail.number
--                color: "#a0a0a2"
--                style: Text.Sunken
--                styleColor: Qt.rgba(0.0, 0.0, 0.0, 0.5)
--                fontSize: "medium"
--            }
--
--            Label {
--                id: dialing
--
--                anchors.horizontalCenter: parent.horizontalCenter
--                anchors.topMargin: units.gu(2)
--                anchors.top: number.bottom
--
--                text: i18n.tr("Dialing")
--                color: "#a0a0a2"
--                style: Text.Sunken
--                styleColor: Qt.rgba(0.0, 0.0, 0.0, 0.5)
--                fontSize: "medium"
--                opacity: (call && call.voicemail && call.dialing) ? 1.0 : 0.0
--            }
--
--            StopWatch {
--                id: stopWatch
--                time: call && call.voicemail ? call.elapsedTime : 0
--
--                anchors.horizontalCenter: parent.horizontalCenter
--                anchors.topMargin: units.gu(2)
--                anchors.bottom: keypad.top
--                opacity: (call && call.voicemail && !call.dialing) ? 1.0 : 0.0
--            }
--
--            Keypad {
--                id: keypad
--
--                anchors.horizontalCenter: parent.horizontalCenter
--                anchors.verticalCenter: parent.verticalCenter
--                onKeyPressed: {
--                    if (call) {
--                        call.sendDTMF(label)
--                    }
--                }
--            }
--
--            Row {
--                anchors.top: keypad.bottom
--                anchors.topMargin: units.gu(3)
--                anchors.horizontalCenter: parent.horizontalCenter
--                spacing: units.gu(0.5)
--                Button {
--                    id: dialhangupButton
--                    iconSource: "../assets/incall_hangup.png"
--                    width: isVoicemailActive() ? units.gu(8) : units.gu(16)
--                    color: isVoicemailActive() ? "#bf400c" : "#268bd2"
--                    onClicked: {
--                        if(isVoicemailActive())
--                            endCall()
--                        else
--                            mainView.callNumber(voicemail.number)
--                    }
--                }
--
--                Button {
--                    id: speakerButton
--                    width: units.gu(8)
--                    visible: isVoicemailActive()
--                    iconSource: call && call.speaker ? "../assets/speaker.png" : "../assets/speaker-mute.png"
--                    color: "#565656"
--                    state: call && call.speaker ? "pressed" : ""
--                    onClicked: {
--                        if (call) {
--                            call.speaker = !call.speaker
--                        }
--                    }
--                }
--            }
--        }
--    }
--}
 === modified file 'src/qml/dialer-app.qml'
 --- src/qml/dialer-app.qml	2014-01-29 19:29:32 +0000
 +++ src/qml/dialer-app.qml	2014-02-21 19:42:08 +0000
@@ -55,22 +55,13 @@
+     }
      function callVoicemail() {
--        if (!telepathyHelper.connected || callManager.voicemailNumber === "") {
--            return
--        }
--        if (pageStack.depth === 1 && !callManager.hasCalls) {
--            pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
--        }
--        callManager.startCall(callManager.voicemailNumber);
++        call(callManager.voicemailNumber);
+     }
      function call(number) {
          if (!telepathyHelper.connected) {
              return
+         }
--        if (number === callManager.voicemailNumber) {
--            callVoicemail()
--        }
          if (pageStack.depth === 1 && !callManager.hasCalls)  {
              pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"))
+         }
@@ -81,17 +72,14 @@
          pageStack.currentPage.currentTab = 2;
+     }
--    function isVoicemailActive() {
--        if (callManager.foregroundCall) {
--            return callManager.foregroundCall.voicemail;
--        } else {
--            return false
--        }
--    }
--
      Component.onCompleted: {
          Theme.name = "Ubuntu.Components.Themes.SuruGradient";
          pageStack.push(Qt.createComponent("MainPage.qml"))
++
++        // if there are calls, even if we don't have info about them yet, push the livecall view
++        if (callManager.hasCalls) {
++            pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
++        }
+     }
      Connections {
@@ -112,12 +100,7 @@
+             }
              // if there are no calls, or if the views are already loaded, do not continue processing
              if ((callManager.foregroundCall || callManager.backgroundCall) && pageStack.depth === 1) {
--                if ((callManager.foregroundCall && callManager.foregroundCall.voicemail)
--                        || (callManager.backgroundCall && callManager.backgroundCall.voicemail)) {
--                    pageStack.push(Qt.resolvedUrl("VoicemailPage/VoicemailPage.qml"))
--                } else  {
--                    pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
--                }
++                pageStack.push(Qt.resolvedUrl("LiveCallPage/LiveCall.qml"));
                  application.activateWindow();
+             }
+         }
 === modified file 'tests/autopilot/dialer_app/tests/test_logs.py'
 --- tests/autopilot/dialer_app/tests/test_logs.py	2014-02-12 17:42:47 +0000
 +++ tests/autopilot/dialer_app/tests/test_logs.py	2014-02-21 19:42:08 +0000
@@ -23,7 +23,6 @@
  import os
  import subprocess
  import time
--import unittest
  @skipIf(model() == 'Desktop',
@@ -77,9 +76,8 @@
          self.assertThat(msg_app_view.visible, Eventually(Equals(True)))
          self.assertThat(msgs_pane.visible, Eventually(Equals(True)))
--        self.assertThat(msgs_pane.number, Eventually(Equals("800")))
++        self.assertThat(msgs_pane.title, Eventually(Equals("800")))
--    @unittest.skip('Test is failing, due to OSD bug, will re-enable soon')
      def test_add_new_contact_from_log(self):
          """Ensure tapping on 'add new contact' item of a call log opens
          the address-book app to allow adding new contact.