Merge lp:~ubuntu-sdk-team/ubuntu-system-settings/dropDialogSizeHack into lp:ubuntu-system-settings

[Cris Dywan]

Remove the dialog internals resizing hack

[Jonas G. Drange (jonas-drange)]

LGTM, thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1146
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1676/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6153
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/868
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7405
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7405/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4530
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4530/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1676/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/wifi/OtherNetwork.qml'
--- plugins/wifi/OtherNetwork.qml	2014-09-18 16:48:38 +0000
+++ plugins/wifi/OtherNetwork.qml	2014-10-22 20:14:33 +0000
@@ -31,51 +31,6 @@
         objectName: "otherNetworkDialog"
         anchorToKeyboard: true
 
-        /* The following is a (bad) workaround for bugs
-            #1337556
-            #1337555
-
-            If the Dialog does not shrink after a user chooses e.g. WPA,
-            the anchorToKeyboard setting of OrientationHelper have no effect,
-            since the dialog never shrinks in size.
-
-            This workaround resizes the Dialog.
-        */
-
-        property int dialogVisualsHeight
-        function getVisibleChildren () {
-            var children = [feedback, networknameLabel, networkname,
-                securityListLabel, securityList, passwordListLabel,
-                password, passwordVisiblityRow, buttonRow];
-            var ret = [];
-            children.forEach(function (child) {
-                if (child.visible) {
-                    ret.push(child);
-                }
-            });
-            return ret;
-        }
-
-        function getVisibleChildrenHeight () {
-            var h = 0;
-            getVisibleChildren().forEach(function (child) {
-                h = h + child.height;
-            });
-            return h;
-        }
-
-        Component.onCompleted: {
-            dialogVisualsHeight =
-                __foreground.height - getVisibleChildrenHeight();
-        }
-
-        Binding {
-            target: __foreground
-            property: "height"
-            value: dialogVisualsHeight + getVisibleChildrenHeight()
-            when: dialogVisualsHeight
-        }
-
         function settingsValid() {
             if(networkname.length == 0) {
                 return false;