ubuntu-system-settings

plugins/cellular/CMakeLists.txt (+1/-0)
plugins/cellular/Components/CMakeLists.txt (+4/-1)
plugins/cellular/Components/CellularMultiSim.qml (+16/-18)
plugins/cellular/Components/CellularSingleSim.qml (+13/-14)
plugins/cellular/Components/DefaultSim.qml (+3/-4)
plugins/cellular/Components/MultiSim.qml (+120/-0)
plugins/cellular/Components/NoSim.qml (+51/-0)
plugins/cellular/Components/Sim.qml (+2/-0)
plugins/cellular/Components/SimEditor.qml (+8/-8)
plugins/cellular/Components/SingleSim.qml (+76/-0)
plugins/cellular/PageChooseCarriers.qml (+9/-10)
plugins/cellular/PageComponent.qml (+42/-159)
plugins/cellular/sims.js (+34/-0)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+5/-3)
tests/autopilot/ubuntu_system_settings/tests/ofono.py (+215/-0)
tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+96/-1)

To merge this branch:

bzr merge lp:~jonas-drange/ubuntu-system-settings/1357393-fix

Critical

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Ken VanDine			Approve on 2014-08-22
PS Jenkins bot	continuous-integration	2014-08-19	Approve on 2014-08-22
Review via email: mp+231347@code.launchpad.net

This proposal supersedes a proposal from 2014-08-17.

Commit message

[cellular] displays cellular UIs based on how many SIMs are present.

Description of the change

Hi,

this creates three states for the cellular UI to be in:

* noSim
* singleSim
* multiSim

It also adds some logic for an arbitrary number of SIMs, however, the multiSim UI currently only supports two.

In addition to all of the above, this branch will be ready for SIM hotswapping, even though re-inserting SIMs currently does not work (broken at lower levels).

Thanks

* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
    yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
    jenkins
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
    jenkins
* Has your component "TestPlan” been executed successfully on emulator, N4?
    n4 and other device
* Has a 5 minute exploratory testing run been executed on N4?
    no/jenkins?
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
    N/A
* If you changed the UI, did you subscribe the design-reviewers to this MP?
    How?
* What components might get impacted by your changes?
    USS Phone panel
* Have you requested review by the teams of these owning components?
    Yes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-18: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:913
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/1357393-fix/+merge/231136/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:916
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/1357393-fix/+merge/231136/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1244/
Executed test runs:
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2895/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/437/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/433/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/436/console
    None: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3179/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-19: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:917
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/1357393-fix/+merge/231136/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-19:

FAILED: Continuous integration, rev:918
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jonas-drange/ubuntu-system-settings/1357393-fix/+merge/231347/+edit-commit-message

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/1357393-fix updated on 2014-08-19

919. By Jonas G. Drange on 2014-08-19: fix small rendering issues

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-20:

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

review: Approve (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/1357393-fix updated on 2014-08-20

920. By Jonas G. Drange on 2014-08-20: merge trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-20:

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-22:

Works well on my dual sim device. One small nit pick thing inlineh

review: Needs Fixing

lp:~jonas-drange/ubuntu-system-settings/1357393-fix updated on 2014-08-22

921. By Jonas G. Drange on 2014-08-22: merge trunk
922. By Jonas G. Drange on 2014-08-22: cleanup of extra lines

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-08-22:

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

review: Approve (continuous-integration)

Revision history for this message

Ken VanDine (ken-vandine) wrote on 2014-08-22:

Thanks!

review: Approve

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:

Jonas G. Drange

Ubuntu Touch System Settings

 === modified file 'plugins/cellular/CMakeLists.txt'
 --- plugins/cellular/CMakeLists.txt	2014-07-17 20:59:15 +0000
 +++ plugins/cellular/CMakeLists.txt	2014-08-22 10:53:29 +0000
@@ -9,6 +9,7 @@
      PageComponent.qml
      Hotspot.qml
      HotspotSetup.qml
++    sims.js
+ )
 === modified file 'plugins/cellular/Components/CMakeLists.txt'
 --- plugins/cellular/Components/CMakeLists.txt	2014-07-31 20:10:40 +0000
 +++ plugins/cellular/Components/CMakeLists.txt	2014-08-22 10:53:29 +0000
@@ -1,6 +1,9 @@
  set(QML_SOURCES
++    NoSim.qml
++    SingleSim.qml
++    MultiSim.qml
      CellularSingleSim.qml
--    CellularDualSim.qml
++    CellularMultiSim.qml
      data-helpers.js
      DefaultSim.qml
      Sim.qml
 === renamed file 'plugins/cellular/Components/CellularDualSim.qml' => 'plugins/cellular/Components/CellularMultiSim.qml'
 --- plugins/cellular/Components/CellularDualSim.qml	2014-08-14 13:59:57 +0000
 +++ plugins/cellular/Components/CellularMultiSim.qml	2014-08-22 10:53:29 +0000
@@ -24,20 +24,18 @@
  Column {
      id: root
--    property var sim1
--    property var sim2
      property var selector: selector
      property var prefMap: ['gsm', 'umts']
      function getNameFromIndex (index) {
--        return [i18n.tr("Off"), sim1.title, sim2.title][index];
++        return [i18n.tr("Off"), sims[0].title, sims[1].title][index];
+     }
      function getUsedSim () {
          if (state === "sim1Online") {
--            return sim1;
++            return sims[0];
          } else if (state === "sim2Online") {
--            return sim2;
++            return sims[1];
          } else {
              return null;
+         }
@@ -47,7 +45,7 @@
      states: [
          State {
              name: "sim1Online"
--            when: sim1.connMan.powered && !sim2.connMan.powered
++            when: sims[0].connMan.powered && !sims[1].connMan.powered
              StateChangeScript { script: {
                  selector.selectedIndex =
                      DataHelpers.dualSimKeyToIndex(
@@ -56,7 +54,7 @@
          },
          State {
              name: "sim2Online"
--            when: sim2.connMan.powered && !sim1.connMan.powered
++            when: sims[1].connMan.powered && !sims[0].connMan.powered
              StateChangeScript { script: {
                  selector.selectedIndex =
                      DataHelpers.dualSimKeyToIndex(
@@ -65,9 +63,9 @@
          },
          State {
              name: "bothOnline"
--            when: sim1.connMan.powered && sim2.connMan.powered
++            when: sims[0].connMan.powered && sims[1].connMan.powered
              StateChangeScript { script: {
--                sim2.connMan.powered = false;
++                sims[1].connMan.powered = false;
              }}
+         }
+     ]
@@ -82,16 +80,16 @@
              objectName: "use" + modelData
              text: getNameFromIndex(index)
+         }
--        selectedIndex: [true, sim1.connMan.powered, sim2.connMan.powered]
++        selectedIndex: [true, sims[0].connMan.powered, sims[1].connMan.powered]
              .lastIndexOf(true)
          onDelegateClicked: {
--            sim1.connMan.powered = (index === 1)
--            sim2.connMan.powered = (index === 2)
++            sims[0].connMan.powered = (index === 1)
++            sims[1].connMan.powered = (index === 2)
+         }
+     }
      Connections {
--        target: sim1.connMan
++        target: sims[0].connMan
          onPoweredChanged: {
              if (powered) {
                  use.selectedIndex = 1;
@@ -100,7 +98,7 @@
+     }
      Connections {
--        target: sim2.connMan
++        target: sims[1].connMan
          onPoweredChanged: {
              if (powered) {
                  use.selectedIndex = 2;
@@ -124,9 +122,9 @@
+     }
      Connections {
--        target: sim1.radioSettings
++        target: sims[0].radioSettings
          onTechnologyPreferenceChanged: {
--            if (sim1.connMan.powered) {
++            if (sims[0].connMan.powered) {
                  selector.selectedIndex =
                      DataHelpers.dualSimKeyToIndex(preference);
+             }
@@ -134,9 +132,9 @@
+     }
      Connections {
--        target: sim2.radioSettings
++        target: sims[1].radioSettings
          onTechnologyPreferenceChanged: {
--            if (sim2.connMan.powered) {
++            if (sims[1].connMan.powered) {
                  selector.selectedIndex =
                      DataHelpers.dualSimKeyToIndex(preference);
+             }
 === modified file 'plugins/cellular/Components/CellularSingleSim.qml'
 --- plugins/cellular/Components/CellularSingleSim.qml	2014-08-14 13:59:57 +0000
 +++ plugins/cellular/Components/CellularSingleSim.qml	2014-08-22 10:53:29 +0000
@@ -25,7 +25,6 @@
  Column {
      height: childrenRect.height
--    property var sim1
      property var selector: selector
      ListItem.ItemSelector {
@@ -33,15 +32,15 @@
          objectName: "technologyPreferenceSelector"
          text: i18n.tr("Cellular data:")
          expanded: true
--        enabled: sim1.radioSettings.technologyPreference !== ""
++        enabled: sim.radioSettings.technologyPreference !== ""
          model: [
              i18n.tr("Off"),
              i18n.tr("2G only (saves battery)"),
              i18n.tr("2G/3G/4G (faster)")]
          selectedIndex: {
--            if (sim1.connMan.powered) {
++            if (sim.connMan.powered) {
                  return DataHelpers.singleSimKeyToIndex(
--                    sim1.radioSettings.technologyPreference);
++                    sim.radioSettings.technologyPreference);
              } else {
                  return 0;
+             }
@@ -52,20 +51,20 @@
          id: dataRoamingItem
          objectName: "dataRoamingSwitch"
          text: i18n.tr("Data roaming")
--        enabled: sim1.connMan.powered
++        enabled: sim.connMan.powered
          control: Switch {
              id: dataRoamingControl
--            checked: sim1.connMan.roamingAllowed
--            onClicked: sim1.connMan.roamingAllowed = checked
++            checked: sim.connMan.roamingAllowed
++            onClicked: sim.connMan.roamingAllowed = checked
+         }
+     }
      Connections {
--        target: sim1.connMan
++        target: sim.connMan
          onPoweredChanged: {
              if (powered) {
                  selector.selectedIndex = DataHelpers.singleSimKeyToIndex(
--                    sim1.radioSettings.technologyPreference);
++                    sim.radioSettings.technologyPreference);
              } else {
                  selector.selectedIndex = 0;
+             }
@@ -73,24 +72,24 @@
+     }
      Connections {
--        target: sim1.radioSettings
++        target: sim.radioSettings
          onTechnologyPreferenceChanged: {
              var selIndex = selector.selectedIndex;
              if (selIndex > 0) {
--                sim1.radioSettings.technologyPreference =
++                sim.radioSettings.technologyPreference =
                      DataHelpers.singleSimIndexToKey(selIndex);
+             }
+         }
+     }
      Binding {
--        target: sim1.connMan
++        target: sim.connMan
          property: "powered"
          value: selector.selectedIndex !== 0
+     }
      Binding {
--        target: sim1.radioSettings
++        target: sim.radioSettings
          property: "technologyPreference"
          value: {
              var i = selector.selectedIndex;
@@ -99,7 +98,7 @@
              } else if (i === 2) {
                  return 'umts';
              } else {
--                return sim1.radioSettings.technologyPreference
++                return sim.radioSettings.technologyPreference
+             }
+         }
+     }
 === modified file 'plugins/cellular/Components/DefaultSim.qml'
 --- plugins/cellular/Components/DefaultSim.qml	2014-08-14 09:59:56 +0000
 +++ plugins/cellular/Components/DefaultSim.qml	2014-08-22 10:53:29 +0000
@@ -23,10 +23,10 @@
  Column {
--    property var m: ["ask", sim1.path, sim2.path]
++    property var m: ["ask", sims[0].path, sims[1].path]
      function getNameFromIndex (index) {
--        return [i18n.tr("Ask me each time"), sim1.title, sim2.title][index];
++        return [i18n.tr("Ask me each time"), sims[0].title, sims[1].title][index];
+     }
      ListItem.ItemSelector {
@@ -45,8 +45,7 @@
+     }
      ListItem.Caption {
--        text: i18n.tr("You can change the SIM for individual calls,
--            or for contacts in the address book.")
++        text: i18n.tr("You can change the SIM for individual calls, or for contacts in the address book.")
+     }
      ListItem.Divider {}
 === added file 'plugins/cellular/Components/MultiSim.qml'
 --- plugins/cellular/Components/MultiSim.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/Components/MultiSim.qml	2014-08-22 10:53:29 +0000
@@ -0,0 +1,120 @@
++/*
++ * 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 <jonas.drange@canonical.com>
++ *
++*/
++import QtQuick 2.0
++import GSettings 1.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Column {
++
++    objectName: "multiSim"
++
++    property var sims
++    property var modems
++
++    // make settings available to all children of root
++    property var settings: phoneSettings
++
++    CellularMultiSim {
++        anchors { left: parent.left; right: parent.right }
++    }
++
++    ListItem.Divider {}
++
++    ListItem.SingleValue {
++        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
++        visible: showAllUI && !hotspotItem.visible
++    }
++
++    ListItem.SingleValue {
++        id: hotspotItem
++        text: i18n.tr("Wi-Fi hotspot")
++        progression: true
++        onClicked: {
++            pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
++        }
++        visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
++    }
++
++    ListItem.Standard {
++        id: dataUsage
++        text: i18n.tr("Data usage statistics")
++        progression: true
++        visible: showAllUI
++    }
++
++    ListItem.Divider {
++        visible: hotspotItem.visible || dataUsage.visible
++    }
++
++    ListItem.SingleValue {
++        text: i18n.tr("Carriers")
++        id: chooseCarrier
++        objectName: "chooseCarrier"
++        progression: enabled
++        onClicked: {
++            pageStack.push(Qt.resolvedUrl("../PageChooseCarriers.qml"), {
++                sims: sims
++            });
++        }
++    }
++
++    ListItem.Divider {}
++
++    SimEditor {
++        anchors { left: parent.left; right: parent.right }
++    }
++
++    ListItem.Divider {}
++
++    DefaultSim {
++        anchors { left: parent.left; right: parent.right }
++    }
++
++    GSettings {
++        id: phoneSettings
++        schema.id: "com.ubuntu.phone"
++        Component.onCompleted: {
++            // set default names
++            var simNames = phoneSettings.simNames;
++            var m0 = modems[0];
++            var m1 = modems[1];
++            if (!simNames[m0]) {
++                simNames[m0] = "SIM 1";
++            }
++            if (!simNames[m1]) {
++                simNames[m1] = "SIM 2";
++            }
++            phoneSettings.simNames = simNames;
++        }
++    }
++
++    Binding {
++        target: sims[0]
++        property: "name"
++        value: phoneSettings.simNames[modems[0]]
++    }
++
++    Binding {
++        target: sims[1]
++        property: "name"
++        value: phoneSettings.simNames[modems[1]]
++    }
++}
 === added file 'plugins/cellular/Components/NoSim.qml'
 --- plugins/cellular/Components/NoSim.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/Components/NoSim.qml	2014-08-22 10:53:29 +0000
@@ -0,0 +1,51 @@
++/*
++ * 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 <jonas.drange@canonical.com>
++ *
++*/
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Column {
++
++    objectName: "noSim"
++
++    ListItem.ItemSelector {
++        text: i18n.tr("Cellular data:")
++        expanded: true
++        enabled: false
++        model: [i18n.tr("Off"), i18n.tr("2G only (saves battery)"), i18n.tr("2G/3G/4G (faster)")]
++        selectedIndex: -1
++    }
++
++    ListItem.Standard {
++        text: i18n.tr("Data roaming")
++        enabled: false
++        control: Switch {
++            checked: false
++        }
++    }
++
++    ListItem.Divider {}
++
++    ListItem.SingleValue {
++        text: i18n.tr("Carrier");
++        value: i18n.tr("N/A")
++        enabled: false
++    }
++}
 === modified file 'plugins/cellular/Components/Sim.qml'
 --- plugins/cellular/Components/Sim.qml	2014-07-25 13:33:36 +0000
 +++ plugins/cellular/Components/Sim.qml	2014-08-22 10:53:29 +0000
@@ -21,12 +21,14 @@
  import MeeGo.QOfono 0.2
  Item {
++    id: root
      property alias modem: modem
      property alias netReg: netReg
      property alias radioSettings: radioSettings
      property alias simMng: simMng
      property alias connMan: connMan
++    property alias present: simMng.present
      property string path
      property string name
      property string title: {
 === modified file 'plugins/cellular/Components/SimEditor.qml'
 --- plugins/cellular/Components/SimEditor.qml	2014-08-15 19:58:34 +0000
 +++ plugins/cellular/Components/SimEditor.qml	2014-08-22 10:53:29 +0000
@@ -44,7 +44,7 @@
              name: "editingSim1"
              PropertyChanges {
                  target: nameField
--                text: sim1.name
++                text: sims[0].name
+             }
              ParentChange {
                  target: editor
@@ -60,7 +60,7 @@
              name: "editingSim2"
              PropertyChanges {
                  target: nameField
--                text: sim2.name
++                text: sims[1].name
+             }
              ParentChange {
                  target: editor
@@ -108,7 +108,7 @@
                              right: parent.right
                              verticalCenter: parent.verticalCenter
+                         }
--                        text: sim1.title
++                        text: sims[0].title
+                     }
+                 }
                  Column {
@@ -144,7 +144,7 @@
                              right: parent.right
                              verticalCenter: parent.verticalCenter
+                         }
--                        text: sim2.title
++                        text: sims[1].title
+                     }
+                 }
                  Column {
@@ -213,11 +213,11 @@
              onTriggered: {
                  var tmpSimNames = {};
                  if (simList.state === "editingSim1") {
--                    tmpSimNames[sim1.path] = nameField.text;
--                    tmpSimNames[sim2.path] = sim2.name;
++                    tmpSimNames[sims[0].path] = nameField.text;
++                    tmpSimNames[sims[1].path] = sims[1].name;
                  } else if (simList.state === "editingSim2") {
--                    tmpSimNames[sim1.path] = sim1.name;
--                    tmpSimNames[sim2.path] = nameField.text;
++                    tmpSimNames[sims[0].path] = sims[0].name;
++                    tmpSimNames[sims[1].path] = nameField.text;
+                 }
                  phoneSettings.simNames = tmpSimNames;
                  simList.state = "";
 === added file 'plugins/cellular/Components/SingleSim.qml'
 --- plugins/cellular/Components/SingleSim.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/Components/SingleSim.qml	2014-08-22 10:53:29 +0000
@@ -0,0 +1,76 @@
++/*
++ * 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 <jonas.drange@canonical.com>
++ *
++*/
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import Ubuntu.Components.ListItems 0.1 as ListItem
++
++Column {
++
++    objectName: "singleSim"
++
++    property var sim
++
++    CellularSingleSim {
++        anchors { left: parent.left; right: parent.right }
++    }
++
++    ListItem.Divider {}
++
++    ListItem.SingleValue {
++        text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
++        visible: showAllUI && !hotspotItem.visible
++    }
++
++    ListItem.SingleValue {
++        id: hotspotItem
++        text: i18n.tr("Wi-Fi hotspot")
++        progression: true
++        onClicked: {
++            pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
++        }
++        visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
++    }
++
++    ListItem.Standard {
++        text: i18n.tr("Data usage statistics")
++        progression: true
++        visible: showAllUI
++    }
++
++    ListItem.SingleValue {
++        text: i18n.tr("Carrier");
++        id: chooseCarrier
++        objectName: "chooseCarrier"
++        progression: enabled
++        value: sim.netReg.name || i18n.tr("N/A")
++        onClicked: {
++            pageStack.push(Qt.resolvedUrl("../PageChooseCarrier.qml"), {
++                netReg: sim.netReg,
++                title: i18n.tr("Carrier")
++            })
++        }
++    }
++
++    ListItem.Standard {
++        text: i18n.tr("APN")
++        progression: true
++        visible: showAllUI
++    }
++}
 === modified file 'plugins/cellular/PageChooseCarriers.qml'
 --- plugins/cellular/PageChooseCarriers.qml	2014-07-24 19:00:45 +0000
 +++ plugins/cellular/PageChooseCarriers.qml	2014-08-22 10:53:29 +0000
@@ -28,8 +28,7 @@
      title: i18n.tr("Carriers")
      objectName: "chooseCarriersPage"
--    property var sim1
--    property var sim2
++    property var sims
      Flickable {
          anchors.fill: parent
@@ -42,33 +41,33 @@
              anchors.right: parent.right
              ListItem.Standard {
--                text: sim1.title
++                text: sims[0].title
+             }
              ListItem.SingleValue {
                  objectName: "chooseCarrierSim1"
--                value: sim1.netReg.name ? sim1.netReg.name : i18n.tr("N/A")
++                value: sims[0].netReg.name ? sims[0].netReg.name : i18n.tr("N/A")
                  progression: true
                  onClicked: {
                      pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
--                        netReg: sim1.netReg,
--                        title: sim1.title
++                        netReg: sims[0].netReg,
++                        title: sims[0].title
                      })
+                 }
+             }
              ListItem.Standard {
--                text: sim2.title
++                text: sims[1].title
+             }
              ListItem.SingleValue {
                  objectName: "chooseCarrierSim2"
--                value: sim2.netReg.name ? sim2.netReg.name : i18n.tr("N/A")
++                value: sims[1].netReg.name ? sims[1].netReg.name : i18n.tr("N/A")
                  progression: true
                  onClicked: {
                      pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
--                        netReg: sim2.netReg,
--                        title: sim2.title
++                        netReg: sims[1].netReg,
++                        title: sims[1].title
                      })
+                 }
+             }
 === modified file 'plugins/cellular/PageComponent.qml'
 --- plugins/cellular/PageComponent.qml	2014-08-12 16:25:26 +0000
 +++ plugins/cellular/PageComponent.qml	2014-08-22 10:53:29 +0000
@@ -19,53 +19,69 @@
   */
  import QtQuick 2.0
--import GSettings 1.0
  import SystemSettings 1.0
  import Ubuntu.Components 0.1
  import Ubuntu.Components.ListItems 0.1 as ListItem
  import MeeGo.QOfono 0.2
  import QMenuModel 0.1
--import "Components"
++import "Components" as LocalComponents
++import "sims.js" as Sims
  ItemPage {
      id: root
      title: i18n.tr("Cellular")
      objectName: "cellularPage"
--    // pointers to sim 1 and 2, lazy loaded
--    property alias sim1: simOneLoader.item
--    property alias sim2: simTwoLoader.item
      property var modemsSorted: manager.modems.slice(0).sort()
++    property int simsLoaded: 0
      states: [
          State {
++            name: "noSim"
++            when: (simsLoaded === 0) || (Sims.getPresentCount() === 0)
++            StateChangeScript {
++                script: loader.source = "Components/NoSim.qml"
++            }
++        },
++        State {
              name: "singleSim"
              StateChangeScript {
--                name: "loadSim"
--                script: {
--                    var p = modemsSorted[0];
--                    simOneLoader.setSource("Components/Sim.qml", {
--                        path: p
--                    });
--                }
++                script: loader.setSource("Components/SingleSim.qml", {
++                    sim: Sims.get(0)
++                })
+             }
++            when: simsLoaded && (Sims.getPresentCount() === 1)
          },
          State {
--            name: "dualSim"
--            extend: "singleSim"
++            name: "multiSim"
              StateChangeScript {
--                name: "loadSecondSim"
--                script: {
--                    var p = modemsSorted[1];
--                    simTwoLoader.setSource("Components/Sim.qml", {
--                        path: p
--                    });
--                    defaultSimLoader.source = "Components/DefaultSim.qml";
--                }
++                script: loader.setSource("Components/MultiSim.qml", {
++                    sims: Sims.getAll(),
++                    modems: modemsSorted
++                })
+             }
++            when: simsLoaded && (Sims.getPresentCount() > 1)
+         }
+     ]
++    OfonoManager {
++        id: manager
++        Component.onCompleted: {
++            var component = Qt.createComponent("Components/Sim.qml");
++            modemsSorted.forEach(function (path) {
++                console.warn('creating sim object for', path)
++                var sim = component.createObject(root, {
++                    path: path
++                });
++                if (sim === null) {
++                    console.warn('failed to create sim object');
++                } else {
++                    Sims.add(sim);
++                }
++            });
++        }
++    }
++
      QDBusActionGroup {
          id: actionGroup
          busType: 1
@@ -78,42 +94,6 @@
              start()
+         }
+     }
--
--    OfonoManager {
--        id: manager
--        Component.onCompleted: {
--            if (modems.length === 1) {
--                root.state = "singleSim";
--            } else if (modems.length === 2) {
--                root.state = "dualSim";
--            }
--        }
--    }
--
--    Loader {
--        id: simOneLoader
--        onLoaded: {
--            if (parent.state === "singleSim") {
--                cellData.setSource("Components/CellularSingleSim.qml", {
--                    sim1: sim1
--                });
--            }
--        }
--    }
--
--    Loader {
--        id: simTwoLoader
--        onLoaded: {
--            // unload any single sim setup
--            cellData.source = "";
--            cellData.setSource("Components/CellularDualSim.qml", {
--                sim1: sim1,
--                sim2: sim2
--            });
--            simEditorLoader.source = "Components/SimEditor.qml";
--        }
--    }
--
      Flickable {
          anchors.fill: parent
          contentWidth: parent.width
@@ -124,106 +104,9 @@
              anchors { left: parent.left; right: parent.right }
              Loader {
--                id: cellData
--                anchors { left: parent.left; right: parent.right }
--            }
--
--            ListItem.SingleValue {
--                text : i18n.tr("Hotspot disabled because Wi-Fi is off.")
--                visible: showAllUI && !hotspotItem.visible
--            }
--
--            ListItem.SingleValue {
--                id: hotspotItem
--                text: i18n.tr("Wi-Fi hotspot")
--                progression: true
--                onClicked: {
--                    pageStack.push(Qt.resolvedUrl("Hotspot.qml"))
--                }
--                visible: showAllUI && (actionGroup.actionObject.valid ? actionGroup.actionObject.state : false)
--            }
--
--            ListItem.Standard {
--                text: i18n.tr("Data usage statistics")
--                progression: true
--                visible: showAllUI
--            }
--
--            ListItem.SingleValue {
--                text: i18n.tr("Carrier", "Carriers", manager.modems.length);
--                id: chooseCarrier
--                objectName: "chooseCarrier"
--                progression: enabled
--                onClicked: {
--                    if (root.state === 'singleSim') {
--                        pageStack.push(Qt.resolvedUrl("PageChooseCarrier.qml"), {
--                            netReg: sim1.netReg,
--                            title: i18n.tr("Carrier")
--                        })
--                    } else if (root.state === 'dualSim') {
--                        pageStack.push(Qt.resolvedUrl("PageChooseCarriers.qml"), {
--                            sim1: sim1,
--                            sim2: sim2
--                        });
--                    }
--                }
--            }
--
--            Binding {
--                target: chooseCarrier
--                property: "value"
--                value: sim1.netReg.name || i18n.tr("N/A")
--                when: (simOneLoader.status === Loader.Ready) && root.state === "singleSim"
--            }
--
--            ListItem.Standard {
--                text: i18n.tr("APN")
--                progression: true
--                visible: showAllUI
--            }
--
--            Loader {
--                id: simEditorLoader
--                anchors { left: parent.left; right: parent.right }
--            }
--
--            ListItem.Divider {}
--
--            Loader {
--                id: defaultSimLoader
--                anchors.left: parent.left
--                anchors.right: parent.right
--            }
--        }
--    }
--
--    GSettings {
--        id: phoneSettings
--        schema.id: "com.ubuntu.phone"
--        Component.onCompleted: {
--            // set default names
--            var simNames = phoneSettings.simNames;
--            var m0 = modemsSorted[0];
--            var m1 = modemsSorted[1];
--            if (!simNames[m0]) {
--                simNames[m0] = "SIM 1";
--            }
--            if (!simNames[m1]) {
--                simNames[m1] = "SIM 2";
--            }
--            phoneSettings.simNames = simNames;
--        }
--    }
--
--    Binding {
--        target: sim1
--        property: "name"
--        value: phoneSettings.simNames[modemsSorted[0]]
--    }
--
--    Binding {
--        target: sim2
--        property: "name"
--        value: phoneSettings.simNames[modemsSorted[1]]
++                id: loader
++                anchors { left: parent.left; right: parent.right }
++            }
++        }
+     }
+ }
 === added file 'plugins/cellular/sims.js'
 --- plugins/cellular/sims.js	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/sims.js	2014-08-22 10:53:29 +0000
@@ -0,0 +1,34 @@
++var sims = [];
++
++function add (sim) {
++    sims.push(sim);
++    root.simsLoaded++;
++}
++
++function getAll () {
++    return sims;
++}
++
++function get (n) {
++    return getAll()[n];
++}
++
++function getCount () {
++    return getAll().length;
++}
++
++function getPresent () {
++    var present = [];
++    getAll().forEach(function (sim) {
++        if (sim.present) {
++            present.push(sim);
++        } else {
++            return;
++        }
++    });
++    return present;
++}
++
++function getPresentCount () {
++    return getPresent().length;
++}
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-19 15:26:07 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-22 10:53:29 +0000
@@ -125,7 +125,7 @@
                 'for m in objects if "%s/operator/" in m]' % name
      def mock_connection_manager(self, modem):
--        modem.AddProperty(CONNMAN_IFACE, 'Powered', True)
++        modem.AddProperty(CONNMAN_IFACE, 'Powered', dbus.Boolean(1))
          modem.AddProperty(CONNMAN_IFACE, 'RoamingAllowed', False)
          modem.AddMethods(
              CONNMAN_IFACE,
@@ -194,6 +194,7 @@
                  'SubscriberNumbers': ['123456', '234567']
+             }
          modem.AddProperties(SIM_IFACE, properties)
++        modem.AddProperty(SIM_IFACE, 'Present', True)
          modem.AddMethods(
              SIM_IFACE,
              [('GetProperties', '', 'a{sv}',
@@ -208,7 +209,6 @@
          # create modem_0 proxy
          self.modem_0 = self.dbus_con.get_object('org.ofono', '/ril_0')
--        # Add an available carrier
          self.mock_carriers('ril_0')
          self.mock_radio_settings(self.modem_0)
@@ -232,6 +232,7 @@
          self.dbusmock.AddModem(second_modem, {'Powered': True})
          self.modem_1 = self.dbus_con.get_object(
              'org.ofono', '/%s' % second_modem)
++
          self.modem_1.AddMethods(NETREG_IFACE, [
              ('GetProperties', '', 'a{sv}',
                  'ret = self.GetAll("org.ofono.NetworkRegistration")'),
@@ -253,9 +254,10 @@
      def setUpClass(cls):
          cls.start_system_bus()
          cls.dbus_con = cls.get_dbus(True)
++        template = os.path.join(os.path.dirname(__file__), 'ofono.py')
          # Add a mock Ofono environment so we get consistent results
          (cls.p_mock, cls.obj_ofono) = cls.spawn_server_template(
--            'ofono', stdout=subprocess.PIPE)
++            template, stdout=subprocess.PIPE)
          cls.dbusmock = dbus.Interface(cls.obj_ofono, dbusmock.MOCK_IFACE)
      def setUp(self, panel=None):
 === added file 'tests/autopilot/ubuntu_system_settings/tests/ofono.py'
 --- tests/autopilot/ubuntu_system_settings/tests/ofono.py	1970-01-01 00:00:00 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/ofono.py	2014-08-22 10:53:29 +0000
@@ -0,0 +1,215 @@
++'''ofonod D-BUS mock template'''
++
++# This program is free software; you can redistribute it and/or modify it under
++# the terms of the GNU Lesser General Public License as published by the Free
++# Software Foundation; either version 3 of the License, or (at your option) any
++# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
++# of the license.
++
++__author__ = 'Martin Pitt'
++__email__ = 'martin.pitt@ubuntu.com'
++__copyright__ = '(c) 2013 Canonical Ltd.'
++__license__ = 'LGPL 3+'
++
++
++import dbus
++
++import dbusmock
++
++BUS_NAME = 'org.ofono'
++MAIN_OBJ = '/'
++MAIN_IFACE = 'org.ofono.Manager'
++SYSTEM_BUS = True
++
++NOT_IMPLEMENTED = '''raise dbus.exceptions.DBusException(
++    "org.ofono.Error.NotImplemented")'''
++
++_parameters = {}
++
++
++def load(mock, parameters):
++    global _parameters
++    mock.modems = []  # object paths
++    _parameters = parameters
++    mock.AddMethod(MAIN_IFACE, 'GetModems', '', 'a(oa{sv})',
++                   'ret = [(m, objects[m].GetAll(\
++                        "org.ofono.Modem")) for m in self.modems]')
++
++    if not parameters.get('no_modem', False):
++        mock.AddModem(parameters.get('ModemName', 'ril_0'), {})
++
++
++@dbus.service.method(dbusmock.MOCK_IFACE,
++                     in_signature='sa{sv}', out_signature='s')
++def AddModem(self, name, properties):
++    '''Convenience method to add a modem
++
++    You have to specify a device name which must be a valid part of an object
++    path, e. g. "mock_ac". For future extensions you can specify a "properties"
++    array, but no extra properties are supported for now.
++
++    Returns the new object path.
++    '''
++    path = '/' + name
++    self.AddObject(
++        path,
++        'org.ofono.Modem',
++        {
++            'Online': dbus.Boolean(True, variant_level=1),
++            'Powered': dbus.Boolean(True, variant_level=1),
++            'Lockdown': dbus.Boolean(False, variant_level=1),
++            'Emergency': dbus.Boolean(False, variant_level=1),
++            'Manufacturer': dbus.String('Fakesys', variant_level=1),
++            'Model': dbus.String('Mock Modem', variant_level=1),
++            'Revision': dbus.String('0815.42', variant_level=1),
++            'Type': dbus.String('hardware', variant_level=1),
++            'Interfaces': [
++                'org.ofono.CallVolume',
++                'org.ofono.VoiceCallManager',
++                'org.ofono.NetworkRegistration',
++                'org.ofono.SimManager'],
++            'Features': ['gprs', 'net'],
++        },
++        [
++            ('GetProperties', '', 'a{sv}',
++                'ret = self.GetAll("org.ofono.Modem")'),
++            (
++                'SetProperty', 'sv', '',
++                'self.Set("org.ofono.Modem", args[0], args[1]); '
++                'self.EmitSignal("org.ofono.Modem", "PropertyChanged",'
++                '"sv", [args[0], args[1]])'),
++        ])
++    obj = dbusmock.mockobject.objects[path]
++    obj.name = name
++    add_voice_call_api(obj)
++    add_netreg_api(obj)
++    self.modems.append(path)
++    props = obj.GetAll('org.ofono.Modem', dbus_interface=dbus.PROPERTIES_IFACE)
++    self.EmitSignal(MAIN_IFACE, 'ModemAdded', 'oa{sv}', [path, props])
++    return path
++
++
++def add_voice_call_api(mock):
++    '''Add org.ofono.VoiceCallManager API to a mock'''
++
++    # also add an emergency number which is not a real one, in case one runs a
++    # test case against a production ofono :-)
++    mock.AddProperty(
++        'org.ofono.VoiceCallManager', 'EmergencyNumbers', ['911', '13373'])
++
++    mock.calls = []  # object paths
++
++    mock.AddMethods('org.ofono.VoiceCallManager', [
++        (
++            'GetProperties', '', 'a{sv}',
++            'ret = self.GetAll("org.ofono.VoiceCallManager")'),
++        ('Transfer', '', '', ''),
++        ('SwapCalls', '', '', ''),
++        ('ReleaseAndAnswer', '', '', ''),
++        ('ReleaseAndSwap', '', '', ''),
++        ('HoldAndAnswer', '', '', ''),
++        ('SendTones', 's', '', ''),
++        ('PrivateChat', 'o', 'ao', NOT_IMPLEMENTED),
++        ('CreateMultiparty', '', 'o', NOT_IMPLEMENTED),
++        ('HangupMultiparty', '', '', NOT_IMPLEMENTED),
++        (
++            'GetCalls', '', 'a(oa{sv})',
++            'ret = [(c, objects[c].GetAll("org.ofono.VoiceCall"))\
++             for c in self.calls]')
++    ])
++
++
++@dbus.service.method('org.ofono.VoiceCallManager',
++                     in_signature='ss', out_signature='s')
++def Dial(self, number, hide_callerid):
++    path = self._object_path + '/voicecall%02i' % (len(self.calls) + 1)
++    self.AddObject(
++        path, 'org.ofono.VoiceCall',
++        {
++            'State': dbus.String('dialing', variant_level=1),
++            'LineIdentification': dbus.String(number, variant_level=1),
++            'Name': dbus.String('', variant_level=1),
++            'Multiparty': dbus.Boolean(False, variant_level=1),
++            'Multiparty': dbus.Boolean(False, variant_level=1),
++            'RemoteHeld': dbus.Boolean(False, variant_level=1),
++            'RemoteMultiparty': dbus.Boolean(False, variant_level=1),
++            'Emergency': dbus.Boolean(False, variant_level=1),
++        },
++        [
++            (
++                'GetProperties', '', 'a{sv}',
++                'ret = self.GetAll("org.ofono.VoiceCall")'),
++            ('Deflect', 's', '', NOT_IMPLEMENTED),
++            (
++                'Hangup', '', '',
++                'self.parent.calls.remove(self._object_path);'
++                'self.parent.RemoveObject(self._object_path);'
++                'self.EmitSignal("org.ofono.VoiceCallManager",\
++                     "CallRemoved", "o", [self._object_path])'),
++            ('Answer', '', '', NOT_IMPLEMENTED),
++        ])
++    obj = dbusmock.mockobject.objects[path]
++    obj.parent = self
++    self.calls.append(path)
++    self.EmitSignal('org.ofono.VoiceCallManager', 'CallAdded', 'oa{sv}',
++                    [path, obj.GetProperties()])
++    return path
++
++
++@dbus.service.method('org.ofono.VoiceCallManager',
++                     in_signature='', out_signature='')
++def HangupAll(self):
++    print('XXX HangupAll', self.calls)
++    for c in list(self.calls):  # needs a copy
++        dbusmock.mockobject.objects[c].Hangup()
++    assert self.calls == []
++
++
++def get_all_operators(mock):
++    return 'ret = [(m, objects[m].GetAll("org.ofono.NetworkOperator")) ' \
++           'for m in objects if "%s/operator/" in m]' % mock.name
++
++
++def add_netreg_api(mock):
++    '''Add org.ofono.NetworkRegistration API to a mock'''
++
++    # also add an emergency number which is not a real one, in case one runs a
++    # test case against a production ofono :-)
++    mock.AddProperties('org.ofono.NetworkRegistration', {
++        'Mode': 'auto',
++        'Status': 'registered',
++        'LocationAreaCode': _parameters.get('LocationAreaCode', 987),
++        'CellId': _parameters.get('CellId', 10203),
++        'MobileCountryCode': _parameters.get('MobileCountryCode', '777'),
++        'MobileNetworkCode': _parameters.get('MobileNetworkCode', '11'),
++        'Technology': _parameters.get('Technology', 'gsm'),
++        'Name': _parameters.get('Name', 'fake.tel'),
++        'Strength': _parameters.get('Strength', dbus.Byte(80)),
++        'BaseStation': _parameters.get('BaseStation', ''),
++    })
++
++    mock.AddObject(
++        '/%s/operator/op1' % mock.name,
++        'org.ofono.NetworkOperator',
++        {
++            'Name': _parameters.get('Name', 'fake.tel'),
++            'Status': 'current',
++            'MobileCountryCode': _parameters.get('MobileCountryCode', '777'),
++            'MobileNetworkCode': _parameters.get('MobileNetworkCode', '11'),
++            'Technologies': [_parameters.get('Technology', 'gsm')],
++        },
++        [
++            (
++                'GetProperties', '', 'a{sv}',
++                'ret = self.GetAll("org.ofono.NetworkOperator")'),
++            ('Register', '', '', ''),
++        ])
++
++    mock.AddMethods('org.ofono.NetworkRegistration', [
++        (
++            'GetProperties', '', 'a{sv}',
++            'ret = self.GetAll("org.ofono.NetworkRegistration")'),
++        ('Register', '', '', ''),
++        ('GetOperators', '', 'a(oa{sv})', get_all_operators(mock)),
++        ('Scan', '', 'a(oa{sv})', get_all_operators(mock)),
++    ])
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-14 14:18:17 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-22 10:53:29 +0000
@@ -15,7 +15,7 @@
  from unittest import skip
  from ubuntu_system_settings.tests import (
--    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE)
++    CellularBaseTestCase, CONNMAN_IFACE, RDO_IFACE, SIM_IFACE)
  from ubuntu_system_settings.utils.i18n import ugettext as _
  from ubuntuuitoolkit import emulators as toolkit_emulators
@@ -92,6 +92,14 @@
              Equals(_('Cellular'))
+         )
++    def test_single_sim_layout(self):
++        self.system_settings.main_view.cellular_page.\
++            select_single(objectName="singleSim")
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='multiSim'), raises(StateNotFoundError))
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='noSim'), raises(StateNotFoundError))
++
      def test_current_network(self):
          """ Tests whether the current network is visible and selected """
          self.navigate_to_carrier_page()
@@ -592,3 +600,90 @@
          self.assertEqual(
              gsettings.get_value('default-sim-for-messages').get_string(),
              '/ril_1')
++
++    def test_multi_sim_layout(self):
++        self.system_settings.main_view.cellular_page.\
++            select_single(objectName="multiSim")
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='singleSim'), raises(StateNotFoundError))
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='noSim'), raises(StateNotFoundError))
++
++    def test_remove_one_sim(self):
++        self.modem_0.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'False'])
++
++        self.system_settings.main_view.cellular_page.\
++            select_single(objectName="singleSim")
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='multiSim'), raises(StateNotFoundError))
++        self.assertThat(lambda: self.system_settings.main_view.select_single(
++            objectName='noSim'), raises(StateNotFoundError))
++
++    def test_remove_two_sims(self):
++        self.modem_0.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'False'])
++
++        self.modem_1.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'False'])
++
++        self.system_settings.main_view.cellular_page.\
++            wait_select_single(objectName="noSim")
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='multiSim'), raises(StateNotFoundError))
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='singleSim'), raises(StateNotFoundError))
++
++    def test_remove_and_insert_sims(self):
++        self.modem_0.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'False'])
++
++        self.modem_1.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'False'])
++
++        self.system_settings.main_view.cellular_page.\
++            wait_select_single(objectName="noSim")
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='multiSim'), raises(StateNotFoundError))
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='singleSim'), raises(StateNotFoundError))
++
++        self.modem_0.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'True'])
++
++        self.modem_1.EmitSignal(
++            SIM_IFACE,
++            'PropertyChanged',
++            'sv',
++            ['Present', 'True'])
++
++        self.system_settings.main_view.cellular_page.\
++            wait_select_single(objectName="multiSim")
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='noSim'), raises(StateNotFoundError))
++        self.assertThat(
++            lambda: self.system_settings.main_view.select_single(
++                objectName='singleSim'), raises(StateNotFoundError))