Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1388044 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

[cellular/carriers] new Carrier & APN entry, as well as a major refactor of carrier selection code warranted by the design change.

[cellular/carriers] new Carrier & APN entry, as well as a major refactor of carrier selection code warranted by the design change.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:951
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-rtm-14.09-14.09-armhf-ci/20/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Jonas G. Drange (jonas-drange)]

Thanks, Ken!

review: Approve

=== modified file 'plugins/cellular/CMakeLists.txt'
--- plugins/cellular/CMakeLists.txt	2014-08-27 09:17:50 +0000
+++ plugins/cellular/CMakeLists.txt	2014-12-16 16:24:38 +0000
@@ -4,10 +4,12 @@
 install(FILES settings-cellular.svg DESTINATION ${PLUGIN_MANIFEST_DIR}/icons)
 
 set(QML_SOURCES
+    carriers.js
     CustomApnEditor.qml
     PageChooseApn.qml
     PageChooseCarrier.qml
-    PageChooseCarriers.qml
+    PageCarrierAndApn.qml
+    PageCarriersAndApns.qml
     PageComponent.qml
     Hotspot.qml
     HotspotSetup.qml

=== modified file 'plugins/cellular/Components/MultiSim.qml'
--- plugins/cellular/Components/MultiSim.qml	2014-12-08 16:01:29 +0000
+++ plugins/cellular/Components/MultiSim.qml	2014-12-16 16:24:38 +0000
@@ -43,6 +43,7 @@
         anchors { left: parent.left; right: parent.right }
     }
 
+
     ListItem.SingleValue {
         text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
         visible: showAllUI && !hotspotItem.visible
@@ -70,11 +71,11 @@
     ListItem.SingleValue {
         text: i18n.tr("Carriers")
         id: chooseCarrier
-        objectName: "carriers"
+        objectName: "carrierApnEntry"
         progression: enabled
         showDivider: false
         onClicked: {
-            pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
+            pageStack.push(Qt.resolvedUrl("../PageCarriersAndApns.qml"), {
                 sims: sims
             });
         }

=== modified file 'plugins/cellular/Components/RadioSingleSim.qml'
--- plugins/cellular/Components/RadioSingleSim.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/Components/RadioSingleSim.qml	2014-12-16 16:24:38 +0000
@@ -24,7 +24,7 @@
 Column {
     height: childrenRect.height
 
-    property alias selector: selector
+    property bool enabled: sim.radioSettings.technologyPreference !== ""
 
     ListItem.ItemSelector {
         id: selector
@@ -34,8 +34,8 @@
 
         // an empty string is not a valid preference, which means
         // we disregard the interace and disable the selector
-        enabled: sim.radioSettings.technologyPreference !== ""
-        model: sim.radioSettings.modemTechnologies
+        enabled: parent.enabled
+        model: sim.radioSettings.modemTechnologies || []
 
         delegate: OptionSelectorDelegate {
             objectName: sim.path + "_radio_" + modelData
@@ -48,10 +48,10 @@
             }
             showDivider: false
         }
-        selectedIndex: model.indexOf(sim.radioSettings.technologyPreference)
+        selectedIndex: model.length ?
+            model.indexOf(sim.radioSettings.technologyPreference) : -1
         onDelegateClicked: {
             sim.radioSettings.technologyPreference = model[index];
         }
     }
-
 }

=== modified file 'plugins/cellular/Components/SingleSim.qml'
--- plugins/cellular/Components/SingleSim.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/Components/SingleSim.qml	2014-12-16 16:24:38 +0000
@@ -18,6 +18,7 @@
  *
 */
 import QtQuick 2.0
+import SystemSettings 1.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
@@ -33,8 +34,10 @@
         control: Switch {
             id: dataControl
             objectName: 'data'
-            checked: sim.connMan.powered
-            onClicked: sim.connMan.powered = checked
+            property bool serverChecked: sim.connMan.powered
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: sim.connMan.powered = checked
         }
     }
 
@@ -46,8 +49,10 @@
         control: Switch {
             id: dataRoamingControl
             objectName: "roaming"
-            checked: sim.connMan.roamingAllowed
-            onClicked: sim.connMan.roamingAllowed = checked
+            property bool serverChecked: sim.connMan.roamingAllowed
+            onServerCheckedChanged: checked = serverChecked
+            Component.onCompleted: checked = serverChecked
+            onTriggered: sim.connMan.roamingAllowed = checked
         }
     }
 
@@ -72,36 +77,25 @@
         visible: showAllUI
     }
 
-    ListItem.Divider {
-        visible: radio.selector.model.length
+    ListItem.Divider {
+        visible: radio.visible
     }
 
     RadioSingleSim {
         id: radio
-        anchors { left: parent.left; right: parent.right }
-        visible: radio.selector.model.length
+        anchors { left: parent.left; right: parent.right }
+        visible: radio.enabled
     }
 
-    ListItem.Divider {}
+    ListItem.Divider {}
 
     ListItem.SingleValue {
         text: i18n.tr("Carrier");
         id: chooseCarrier
-        objectName: "carrier"
+        objectName: "carrierApnEntry"
         progression: enabled
-        value: sim.netReg.name || i18n.tr("N/A")
-        enabled: sim.netReg.status !== ""
-        onClicked: {
-            pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
-                sim: sim,
-                title: i18n.tr("Carrier")
-            })
-        }
-    }
-
-    ListItem.Standard {
-        text: i18n.tr("APN")
-        progression: true
-        visible: showAllUI
+        onClicked: pageStack.push(Qt.resolvedUrl("../PageCarrierAndApn.qml"), {
+            sim: sim
+        })
     }
 }

=== added file 'plugins/cellular/PageCarrierAndApn.qml'
--- plugins/cellular/PageCarrierAndApn.qml	1970-01-01 00:00:00 +0000
+++ plugins/cellular/PageCarrierAndApn.qml	2014-12-16 16:24:38 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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 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.0
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+
+ItemPage {
+    id: root
+    title: i18n.tr("Carrier")
+    objectName: "carrierApnPage"
+    flickable: null
+
+    property var sim
+
+    Flickable {
+        anchors.fill: parent
+        contentWidth: parent.width
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+
+        Column {
+            anchors.left: parent.left
+            anchors.right: parent.right
+
+            ListItem.SingleValue {
+                text: i18n.tr("Carrier")
+                objectName: "carrier"
+                value: sim.netReg.name ? sim.netReg.name : i18n.tr("None")
+                enabled: (sim.netReg.status !== "") &&
+                    (sim.netReg.mode !== "auto-only")
+                progression: enabled
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
+                    sim: sim,
+                    title: i18n.tr("Carrier")
+                })
+            }
+
+            ListItem.Standard {
+                text: i18n.tr("APN")
+                objectName: "apn"
+                progression: enabled
+                enabled: sim.connMan.powered
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
+                    sim: sim
+                })
+            }
+        }
+    }
+}

=== renamed file 'plugins/cellular/PageChooseCarriers.qml' => 'plugins/cellular/PageCarriersAndApns.qml'
--- plugins/cellular/PageChooseCarriers.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/PageCarriersAndApns.qml	2014-12-16 16:24:38 +0000
@@ -25,7 +25,8 @@
 ItemPage {
     id: root
     title: i18n.tr("Carriers")
-    objectName: "chooseCarriersPage"
+    objectName: "carrierApnPage"
+    flickable: null
 
     property var sims
 
@@ -39,38 +40,58 @@
             anchors.left: parent.left
             anchors.right: parent.right
 
-            ListItem.Standard {
+            SettingsItemTitle {
                 text: sims[0].title
             }
 
             ListItem.SingleValue {
+                text: i18n.tr("Carrier")
                 objectName: sims[0].path + "_carriers"
-                value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
-                enabled: sims[0].netReg.status !== ""
-                progression: true
-                onClicked: {
-                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
-                        sim: sims[0],
-                        title: sims[0].title
-                    })
-                }
+                value: sims[0].netReg.name ? sims[0].netReg.name :
+                    i18n.tr("None")
+                enabled: (sims[0].netReg.status !== "") &&
+                    (sims[0].netReg.mode !== "auto-only")
+                progression: enabled
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
+                    sim: sims[0],
+                    title: sims[0].title
+                })
             }
 
             ListItem.Standard {
+                text: i18n.tr("APN")
+                progression: enabled
+                enabled: sims[0].connMan.powered
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
+                    sim: sims[0]
+                })
+            }
+
+            SettingsItemTitle {
                 text: sims[1].title
             }
 
             ListItem.SingleValue {
+                text: i18n.tr("Carrier")
                 objectName: sims[1].path + "_carriers"
-                value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
-                enabled: sims[1].netReg.status !== ""
-                progression: true
-                onClicked: {
-                    pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
-                        sim: sims[1],
-                        title: sims[1].title
-                    })
-                }
+                value: sims[1].netReg.name ? sims[1].netReg.name :
+                    i18n.tr("None")
+                enabled: (sims[1].netReg.status !== "") &&
+                    (sims[1].netReg.mode !== "auto-only")
+                progression: enabled
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
+                    sim: sims[1],
+                    title: sims[1].title
+                })
+            }
+
+            ListItem.Standard {
+                text: i18n.tr("APN")
+                progression: enabled
+                enabled: sims[1].connMan.powered
+                onClicked: pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {
+                    sim: sims[1]
+                })
             }
         }
     }

=== modified file 'plugins/cellular/PageChooseCarrier.qml'
--- plugins/cellular/PageChooseCarrier.qml	2014-11-18 20:13:35 +0000
+++ plugins/cellular/PageChooseCarrier.qml	2014-12-16 16:24:38 +0000
@@ -4,6 +4,7 @@
  * Copyright (C) 2013 Canonical Ltd.
  *
  * Contact: Iain Lane <[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
@@ -24,214 +25,235 @@
 import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 1.0 as ListItem
 import MeeGo.QOfono 0.2
+import "carriers.js" as CHelper
 
 ItemPage {
     id: root
     title: i18n.tr("Carrier")
-
     objectName: "chooseCarrierPage"
+    flickable: null
 
     property var sim
-
-    property variant operatorNames
-    property int mode
-
-    QtObject {
-        id: d
-        property bool __suppressActivation : true;
-    }
-
-    Component.onCompleted: {
-        updateNetworkOperators();
-    }
-
-    Connections {
-        target: sim.netReg
-        onNetworkOperatorsChanged: updateNetworkOperators();
-        onCurrentOperatorPathChanged: buildLists();
-    }
-
-    // map of operatorPath : netOp
-    property var operators: ({})
-    function updateNetworkOperators()
-    {
-        var tmp = sim.netReg.networkOperators;
-        var added = tmp.filter(function(i) {
-            return operators[i] === undefined;
-        });
-        var removed = Object.keys(operators).filter(function(i) {
-            return tmp.indexOf(i) === -1;
-        })
-
-        removed.forEach(function(currentValue, index, array) {
-            // just asserting to verify the logic
-            // remove once proven functional
-            if (operators[currentValue] === undefined) {
-                throw "updateNetworkOperators: removed is broken";
-            }
-
-            operators[currentValue].destroy();
-            delete operators[currentValue];
-        });
-
-        added.forEach(function(currentValue, index, array) {
-            // just asserting to verify the logic
-            // remove once proven functional
-            if (operators[currentValue] !== undefined) {
-                throw "updateNetworkOperators: added is broken";
-            }
-
-            operators[currentValue] = netOp.createObject(parent,
-                                                         {
-                                                             "operatorPath": currentValue
-                                                         });
-        });
-
-        // just asserting to verify the logic
-        // remove once proven functional
-        if (Object.keys(operators).length !== tmp.length) {
-            throw "Object.keys(operators).length !== tmp.length";
-        }
-        tmp.forEach(function(currentValue, index, array) {
-            if (operators[currentValue] === undefined)
-                throw "operators[currentValue] === undefined";
-        });
-
-        buildLists();
-    }
-
-    function buildLists()
-    {
-        d.__suppressActivation = true;
-        var oN = new Array();
-
-        for (var i in operators) {
-            var tempOp = operators[i];
-            if (tempOp.status === "forbidden")
-                continue
-            oN.push(tempOp.name);
-        }
-        operatorNames = oN;
-
-        var cur = operators[sim.netReg.currentOperatorPath];
-        carrierSelector.selectedIndex = cur === undefined ? -1 : operatorNames.indexOf(cur.name);
-        d.__suppressActivation = false;
-    }
+    property bool scanning: true
+    property bool working: false
+
+    states: [
+        State {
+            name: "auto"
+            when: sim.netReg.mode === "auto"
+            PropertyChanges {
+                target: otherOperators
+                selectedIndex: -1
+            }
+            PropertyChanges {
+                target: allOperators
+                height: 0
+                opacity: 0
+            }
+        },
+        State {
+            name: "manual"
+            when: sim.netReg.mode === "manual"
+            PropertyChanges {
+                target: otherOperators
+                height: 0
+                opacity: 0
+            }
+        }
+        /* Note that we do not consider auto-only since this page is not
+        reachable in that case (see Carrier & APN page). */
+    ]
 
     Component {
         id: netOp
         OfonoNetworkOperator {
             onRegisterComplete: {
-                if (error === OfonoNetworkOperator.InProgressError) {
-                    console.warn("registerComplete failed with error: " + errorString);
-                } else if (error !== OfonoNetworkOperator.NoError) {
-                    console.warn("registerComplete failed with error: " + errorString + " Falling back to default");
+                if (error !== OfonoNetworkOperator.NoError) {
+                    console.warn("Register complete:", errorString);
+                    console.warn("Falling back to default operator.");
                     sim.netReg.registration();
                 }
-            }
-            onNameChanged:  buildLists();
-            onStatusChanged: buildLists();
-        }
-    }
+                working = false;
+            }
+        }
+    }
+
+    Connections {
+        /* The following is a hack: If a scan is in progress and we call
+        scan() on netReg, it emits a scanError _and_ scanFinished.
+        We look at the scanError message, set this property to true if
+        it says a scan is in progress. This way we can ignore the bad
+        scanFinished signal. Filed bug against libqofono[1].
+            [1] https://github.com/nemomobile/libqofono/issues/52
+        */
+        property bool __scanInProgress: false
+
+        target: sim.netReg
+        onScanFinished: {
+            if (scanning && !__scanInProgress) {
+                scanning = false;
+            }
+            __scanInProgress = false;
+        }
+        onScanError: {
+            if (message === "Operation already in progress") {
+                console.warn('A scan was already in progress.');
+                __scanInProgress = true;
+            } else {
+                scanning = false;
+                __scanInProgress = false;
+                console.warn("onScanError: " + message);
+            }
+        }
+        onModeChanged: modeSelector.selectedIndex = (mode === "auto") ? 0 : -1
+    }
+
+    Component.onCompleted: sim.netReg.scan()
 
     Flickable {
         id: scrollWidget
         anchors.fill: parent
         contentWidth: parent.width
-        contentHeight: parent.height
-        boundsBehavior: (contentHeight > parent.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
+        contentHeight: contentItem.childrenRect.height
+        boundsBehavior: (contentHeight > root.height) ?
+            Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
 
-        ColumnLayout {
+        Column {
             anchors {
                 left: parent.left
                 right: parent.right
             }
+            spacing: 0
+
+            SettingsItemTitle {
+                text: i18n.tr("Carrier")
+
+                ActivityIndicator {
+                    anchors {
+                        right: parent.right
+                        top: parent.top
+                        margins: units.gu(1.5)
+                    }
+                    running: true
+                    opacity: scanning || working ? 1 : 0
+                    Behavior on opacity {
+                        NumberAnimation {
+                            duration: UbuntuAnimation.SnapDuration
+                        }
+                    }
+                }
+            }
 
             ListItem.ItemSelector {
-                id: chooseCarrier
+                id: modeSelector
                 objectName: "mode"
                 expanded: true
-                enabled: sim.netReg.mode !== "auto-only"
-                text: i18n.tr("Choose carrier:")
-                model: [i18n.tr("Automatically"), i18n.tr("Manually")]
-
-                delegate: OptionSelectorDelegate { showDivider: false }
-                selectedIndex: sim.netReg.mode === "manual" ? 1 : 0
-
-                // we only want to do this per user input
+                enabled: !scanning && !working
+                opacity: enabled ? 1 : 0.5
+                model: [i18n.tr("Automatically")]
+                delegate: OptionSelectorDelegate {
+                    text: {
+                        // modelData is "Automatically"
+                        if (sim.netReg.mode === "auto") {
+                            return sim.netReg.name ?
+                                modelData + " [ " + sim.netReg.name + " ]" :
+                                    modelData
+                        } else {
+                            return modelData;
+                        }
+                    }
+                    showDivider: false
+                }
+                selectedIndex: sim.netReg.mode === "auto" ? 0 : -1
+
+                /* When registration() fails, the UI state may end up in an
+                undefined state. Issue[1] has been filed against libqofono.
+                    [1] https://github.com/nemomobile/libqofono/issues/54
+                */
+                onDelegateClicked: sim.netReg.registration()
+            }
+
+            // In manual mode, all non-forbidden operators are shown.
+            ListItem.ItemSelector {
+                id: allOperators
+                objectName: "allOperators"
+                expanded: true
+                enabled: !scanning && !working
+                opacity: enabled ? 1 : 0.5
+                model: CHelper.getOps(sim.netReg.networkOperators)
+                delegate: OptionSelectorDelegate {
+                    objectName: "carrier"
+                    showDivider: false
+                    text: modelData.name
+                }
+                onDelegateClicked: {
+                    CHelper.setOp(model[index].operatorPath);
+                    working = true;
+                }
+                selectedIndex: {
+                    var curop = sim.netReg.currentOperatorPath;
+                    return model.indexOf(CHelper.getOrCreateOpQml(curop));
+                }
+
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+
+                Behavior on opacity {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+            }
+
+            /* When registration mode is "Automatic", this list contains all
+            the non-forbidden operators except the current one. When the user
+            taps one of the elements in this selector, it will be hidden,
+            and the mode will switch to "Manual". */
+            ListItem.ItemSelector {
+                id: otherOperators
+                objectName: "otherOperators"
+                expanded: true
+                enabled: !scanning && !working
+                opacity: enabled ? 1 : 0.5
+                model: CHelper.getOps(sim.netReg.networkOperators,
+                    [sim.netReg.currentOperatorPath])
+                delegate: OptionSelectorDelegate {
+                    objectName: "carrier"
+                    showDivider: false
+                    text: modelData.name
+                }
+                onDelegateClicked: {
+                    var clickedOp = model[index].operatorPath;
+                    CHelper.setOp(clickedOp);
+
+                    // Update immediately and do not wait for netReg
+                    allOperators.selectedIndex = allOperators.model.indexOf(
+                        CHelper.getOrCreateOpQml(clickedOp));
+                    working = true;
+                }
                 onSelectedIndexChanged: {
-                    if (selectedIndex === -1 || d.__suppressActivation)
-                        return;
-
-                    if (selectedIndex === 0) {
-                        sim.netReg.registration();
-                    } else if (selectedIndex === 1) {
-                        if (sim.netReg.status !== "searching")
-                            sim.netReg.scan();
-                    }
-                }
-            }
-
-            ListItem.SingleControl {
-                enabled: chooseCarrier.selectedIndex === 1
-                anchors {
-                    left: parent.left
-                    leftMargin: units.gu(0)
-                }
-                control: ColumnLayout {
-                    id: child
-                    width: parent.width - units.gu(4)
-                    anchors.left: parent.left
-                    RowLayout {
-                        id: searchingRow
-                        spacing: units.gu(1)
-
-                        visible: sim.netReg.status === "searching"
-                        ActivityIndicator {
-                            id: activityIndicator
-                            anchors.verticalCenter: parent.verticalCenter
-                            running: parent.visible
-                        }
-                        Label {
-                            anchors.verticalCenter: parent.verticalCenter
-                            text: i18n.tr("Searching for carriers…")
-                        }
-                    }
-                    ListItem.ItemSelector {
-                        id: carrierSelector
-                        objectName: "carriers"
-                        expanded: true
-                        enabled: sim.netReg.status !== "searching" && chooseCarrier.selectedIndex === 1
-                        // work around ItemSelector not having a visual change depending on being disabled
-                        opacity: enabled ? 1.0 : 0.5
-                        width: parent.width
-                        model: operatorNames
-                        delegate: OptionSelectorDelegate { enabled: carrierSelector.enabled; showDivider: false }
-                        onSelectedIndexChanged: {
-                            if (selectedIndex === -1 || d.__suppressActivation)
-                                return;
-
-                            // this assumes operator names are unique,
-                            // revise if not so
-                            for (var op in operators) {
-                                if (operators[op].name === operatorNames[selectedIndex]) {
-                                    operators[op].registerOperator();
-                                    return;
-                                }
-                            }
-                            // just asserting to verify the logic
-                            // remove once proven functional
-                            throw "should not be reached.";
-                        }
-                    }
-                }
-            }
-            ListItem.Standard {
-                text: i18n.tr("APN")
-                progression: true
-                enabled: sim.connMan.powered
-                onClicked: {
-                    pageStack.push(Qt.resolvedUrl("PageChooseApn.qml"), {sim: sim})
+                    /* When e.g. the model changes, the selectedIndex is set to
+                    0. Ignore this, since we never want the selectedIndex to be
+                    anything other than -1. This component is shown only when
+                    registration is "Automatic". */
+                    if (selectedIndex >= 0) {
+                        selectedIndex = -1;
+                    }
+                }
+
+                Behavior on height {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
+                }
+
+                Behavior on opacity {
+                    NumberAnimation {
+                        duration: UbuntuAnimation.SnapDuration
+                    }
                 }
             }
         }

=== added file 'plugins/cellular/carriers.js'
--- plugins/cellular/carriers.js	1970-01-01 00:00:00 +0000
+++ plugins/cellular/carriers.js	2014-12-16 16:24:38 +0000
@@ -0,0 +1,106 @@
+// Map of path to OfonoNetworkOperator objects
+var _pathToQml = {}
+
+/*
+Given an array of paths, it will create and associate
+an OfonoNetworkOperator QML object for each new path.
+
+It will also delete any QML that is not in given list of paths.
+
+@param {Array} paths - Array of operator paths
+@return {undefined}
+*/
+function updateOperatorQML (paths) {
+    _garbageCollect(paths);
+    _createQml(paths);
+}
+
+function _garbageCollect (paths) {
+    var path;
+    for (path in _pathToQml) {
+        if (_pathToQml.hasOwnProperty(path)) {
+            if (paths.indexOf(path) === -1) {
+                _pathToQml[path].destroy();
+                delete _pathToQml[path];
+            }
+        }
+    }
+}
+
+function _createQml (paths) {
+    paths.forEach(function (path, i) {
+        if (!_pathToQml.hasOwnProperty(path)) {
+            _pathToQml[path] = netOp.createObject(root, {
+                'operatorPath': path
+            });
+        }
+    });
+}
+
+/*
+Takes a list of paths and returns
+OfonoNetworkOperator objects for each path.
+
+This function will create OfonoNetworkOperator
+objects.
+
+@param {Array} paths - Array of operator paths
+@param {Array} ignore - Array of operator paths to ignore
+@return {Array} of OfonoNetworkOperators
+*/
+function getOps (paths, ignore) {
+    var ret = [];
+    ignore = ignore || [];
+    paths.forEach(function (op) {
+        var ofonoOp = getOrCreateOpQml(op);
+        if (ignore.indexOf(op) >= 0) {
+            return;
+        } else if (ofonoOp.status === "forbidden") {
+            return;
+        }
+        ret.push(ofonoOp);
+    });
+    return ret;
+}
+
+/*
+@param path String an operator path
+@return {Object|null} OfonoNetworkOperator|null - null if no QML exist for path
+*/
+function getOp (path) {
+    if (_pathToQml.hasOwnProperty(path)) {
+        return _pathToQml[path];
+    } else {
+        return null;
+    }
+}
+
+/*
+Returns an operator. Before returning it sees
+if we have created QML for this operator path
+before. QML is created if not.
+
+It is guaranteed that a QML object will be returned.
+
+@param {String} path - an operator path
+@return {Object} OfonoNetworkOperator - the created qml
+*/
+function getOrCreateOpQml (path) {
+    if (getOp(path)) {
+        return getOp(path);
+    } else {
+        _createQml([path]);
+        return getOp(path);
+    }
+}
+
+/*
+Registers operator on path
+
+@param {String} path - operator to register
+@return {undefined}
+*/
+function setOp (path) {
+    var op = getOrCreateOpQml(path);
+    op.registerOperator();
+}

=== modified file 'tests/autopilot/ubuntu_system_settings/__init__.py'
--- tests/autopilot/ubuntu_system_settings/__init__.py	2014-11-18 20:13:35 +0000
+++ tests/autopilot/ubuntu_system_settings/__init__.py	2014-12-16 16:24:38 +0000
@@ -277,28 +277,16 @@
 
     @autopilot.logging.log_action(logger.debug)
     def change_carrier(self, carrier, sim=None):
-        if sim:
-            carriersPage = self._click_carriers()
-            carrierPage = carriersPage.select_sim(sim)
-        else:
-            carrierPage = self._click_carrier()
-
-        carrierPage.set_manual()
-        carrierPage.set_carrier(carrier)
-
-    @autopilot.logging.log_action(logger.debug)
-    def _click_carrier(self):
-        item = self.select_single(objectName='carrier')
-        self.pointing_device.click_object(item)
-        return self.get_root_instance().wait_select_single(
-            objectName='chooseCarrierPage')
-
-    @autopilot.logging.log_action(logger.debug)
-    def _click_carriers(self):
-        item = self.select_single(objectName='carriers')
-        self.pointing_device.click_object(item)
-        return self.get_root_instance().wait_select_single(
-            objectName='chooseCarriersPage')
+        carrierApnPage = self._click_carrier_apn()
+        chooseCarrierPage = carrierApnPage.open_carrier(sim)
+        chooseCarrierPage.set_carrier(carrier)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carrier_apn(self):
+        item = self.select_single(objectName='carrierApnEntry')
+        self.pointing_device.click_object(item)
+        return self.get_root_instance().wait_select_single(
+            objectName='carrierApnPage')
 
     @autopilot.logging.log_action(logger.debug)
     def select_sim_for_data(self, sim):
@@ -340,30 +328,42 @@
         self.pointing_device.click_object(ok)
 
 
-class PageChooseCarriers(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
-
-    """Autopilot helper for carrier selection page (multisim)."""
-
-    @autopilot.logging.log_action(logger.debug)
-    def select_sim(self, sim):
-        return self._select_sim(sim)
-
-    @autopilot.logging.log_action(logger.debug)
-    def _select_sim(self, sim):
-        item = self.select_single(objectName='%s_carriers' % sim)
-        self.pointing_device.click_object(item)
+class PageCarrierAndApn(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+
+    """Autopilot helper for carrier/apn entry page (singlesim)."""
+    @autopilot.logging.log_action(logger.debug)
+    def open_carrier(self, sim):
+        return self._click_carrier(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carrier(self, sim):
+        obj = self.select_single(
+            objectName='carrier')
+        self.pointing_device.click_object(obj)
+        return self.get_root_instance().wait_select_single(
+            objectName='chooseCarrierPage')
+
+
+class PageCarriersAndApns(
+        ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
+    """Autopilot helper for carrier/apn entry page (multisim)."""
+    """Autopilot helper for carrier/apn entry page (singlesim)."""
+    @autopilot.logging.log_action(logger.debug)
+    def open_carrier(self, sim):
+        return self._click_carrier(sim)
+
+    @autopilot.logging.log_action(logger.debug)
+    def _click_carrier(self, sim):
+        obj = self.select_single(
+            objectName='%s_carriers' % sim)
+        self.pointing_device.click_object(obj)
         return self.get_root_instance().wait_select_single(
             objectName='chooseCarrierPage')
 
 
 class PageChooseCarrier(ubuntuuitoolkit.UbuntuUIToolkitCustomProxyObjectBase):
 
-    """Autopilot helper for carrier selection page (singlesim)."""
-
-    @autopilot.logging.log_action(logger.debug)
-    def set_manual(self):
-        item = self.select_single(text='Manually')
-        self.pointing_device.click_object(item)
+    """Autopilot helper for carrier selection page"""
 
     @autopilot.logging.log_action(logger.debug)
     def set_automatic(self):
@@ -374,7 +374,17 @@
         # wait for animation, since page.animationRunning.wait_for(False)
         # does not work?
         sleep(0.5)
-        item = self.select_single(text=carrier)
+        allOperators = self.select_single(objectName="allOperators")
+        otherOperators = self.select_single(objectName="otherOperators")
+
+        if allOperators.visible:
+            opList = allOperators
+        elif otherOperators.visible:
+            opList = otherOperators
+        else:
+            raise Exception("No operator list visible.")
+
+        item = opList.select_single(text=carrier, objectName="carrier")
         self.pointing_device.click_object(item)