Merge lp:~unity-team/dialer-app/dialer-app-dgu into lp:dialer-app

[Gerry Boland]

Fixes for dynamic grid units support: set implicit sizes on MainView, and have min/max window size update on GU change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:514
http://jenkins.qa.ubuntu.com/job/dialer-app-ci/632/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/dialer-app-vivid-i386-ci/145
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6549
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4995
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6560
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6560/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27736

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

review: Needs Fixing (continuous-integration)

[lp:~unity-team/dialer-app/dialer-app-dgu]

515. By Nick Dedekind on 2016-04-27

added keypad input dgu change handler

=== modified file 'src/qml/DialerPage/KeypadEntry.qml'
--- src/qml/DialerPage/KeypadEntry.qml	2016-03-11 19:43:02 +0000
+++ src/qml/DialerPage/KeypadEntry.qml	2016-04-27 10:02:49 +0000
@@ -128,6 +128,10 @@
         }
 
         onContentWidthChanged: adjustTextSize()
+        Connections {
+            target: units
+            onGridUnitChanged: input.adjustTextSize()
+        }
     }
 
     MouseArea {

=== modified file 'src/qml/dialer-app.qml'
--- src/qml/dialer-app.qml	2016-03-17 22:01:50 +0000
+++ src/qml/dialer-app.qml	2016-04-27 10:02:49 +0000
@@ -65,8 +65,8 @@
     }
 
     automaticOrientation: false
-    width: units.gu(40)
-    height: units.gu(71)
+    implicitWidth: units.gu(40)
+    implicitHeight: units.gu(71)
 
     property bool hasCalls: callManager.hasCalls
 
@@ -479,10 +479,10 @@
         pageStackNormalMode.push(Qt.createComponent("DialerPage/DialerPage.qml"))
 
         // when running in windowed mode, do not allow resizing
-        view.minimumWidth  = width * 0.9
-        view.maximumWidth = width * 1.1
-        view.minimumHeight = height * 0.9
-        view.maximumHeight = height * 1.1
+        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; } )
 
         // if there are calls, even if we don't have info about them yet, push the livecall view
         if (callManager.hasCalls) {