Merge into trunk : expandable-sim-name-editor : Code : ubuntu-system-settings

Status:	Merged
Approved by:	Ken VanDine on 2014-08-12
Approved revision:	827
Merged at revision:	897
Proposed branch:	lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor
Merge into:	lp:ubuntu-system-settings
Prerequisite:	lp:~jonas-drange/ubuntu-system-settings/sim-name-editor
Diff against target:	441 lines (+245/-55) 7 files modified debian/control (+1/-1) plugins/cellular/Components/CMakeLists.txt (+2/-1) plugins/cellular/Components/DefaultSim.qml (+69/-0) plugins/cellular/Components/SimEditor.qml (+100/-38) plugins/cellular/PageComponent.qml (+15/-7) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+20/-0) tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+38/-8)
To merge this branch:	bzr merge lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor
Related bugs:	Link a bug report

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

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-04

812. By Jonas G. Drange on 2014-08-04: removing entry
813. By Jonas G. Drange on 2014-08-04: refactor test

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

Please ensure all the lines are wrapped properly, max 80. Code looks fine, I still need to do some testing on the device. Please see one inline comment as well.

Have you looked into the CI failures?

review: Needs Fixing

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-04

814. By Jonas G. Drange on 2014-08-04: this test is bad, it's not at all a happy path and is not testing against a specific spec
815. By Jonas G. Drange on 2014-08-04: fixing height of expandable, removing obsolete test

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-05

816. By Jonas G. Drange on 2014-08-05: adding dep2
817. By Jonas G. Drange on 2014-08-05: fix conflict after syncing with trunk

Revision history for this message

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

#

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1146/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3024/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2400/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/338/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4267/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2667/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-06

818. By Jonas G. Drange on 2014-08-06: fixed dep

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-06

819. By Jonas G. Drange on 2014-08-06: depping on later version

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:819
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1165/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2456/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2726/console

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-06

820. By Jonas G. Drange on 2014-08-06: merge trunk

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-07

821. By Jonas G. Drange on 2014-08-07: depping on later libgsettings-qt
822. By Jonas G. Drange on 2014-08-07: merging trunk

Revision history for this message

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

#

There are still some lines over 80, and see my inline comment

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-07

823. By Jonas G. Drange on 2014-08-07: removing dep
824. By Jonas G. Drange on 2014-08-07: line over 80 chars edited

Revision history for this message

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

#

The depends version for qtdeclarative5-gsettings1.0 is still incorrect, it needs a{ss}, which was added in 0.1+14.10.20140801.1

review: Needs Fixing

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-07

825. By Jonas G. Drange on 2014-08-07: The depends version for qtdeclarative5-gsettings1.0 is still incorrect, it needs a{ss}, which was added in 0.1+14.10.20140801.1

Revision history for this message

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

#

FAILED: Continuous integration, rev:820
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1174/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3181/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2504/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/366/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4426/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2774/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1176/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3213/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2524/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/368/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2795/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1181/
Executed test runs:
None: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/374/console
None: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/373/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

FAILED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1182/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3285/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2570/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/375/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/374/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4530/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2841/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-12

826. By Jonas G. Drange on 2014-08-12: merge trunk

Revision history for this message

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

#

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

review: Approve (continuous-integration)

lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor updated on 2014-08-12

827. By Jonas G. Drange on 2014-08-12: merging prereq

Revision history for this message

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

#

Looks good, tested on a dual sim device

review: Approve

Revision history for this message

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

#

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

review: Approve (continuous-integration)

ubuntu-system-settings

Merge lp:~jonas-drange/ubuntu-system-settings/expandable-sim-name-editor into lp:ubuntu-system-settings

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'debian/control'
 --- debian/control	2014-08-12 00:38:40 +0000
 +++ debian/control	2014-08-12 16:25:41 +0000
@@ -61,7 +61,7 @@
           qmenumodel-qml,
           qtdeclarative5-folderlistmodel-plugin,
           qml-module-qtmultimedia | qml-module-qtmultimedia-gles,
--         qtdeclarative5-gsettings1.0 (>=0.0+13.10.20130717),
++         qtdeclarative5-gsettings1.0 (>=0.1+14.10.20140801.1),
           qtdeclarative5-ofono0.2,
           qtdeclarative5-systeminfo-plugin,
           qtdeclarative5-ubuntu-content1,
 === modified file 'plugins/cellular/Components/CMakeLists.txt'
 --- plugins/cellular/Components/CMakeLists.txt	2014-07-24 16:04:51 +0000
 +++ plugins/cellular/Components/CMakeLists.txt	2014-08-12 16:25:41 +0000
@@ -1,7 +1,8 @@
  set(QML_SOURCES
      CellularSingleSim.qml
++    CellularDualSim.qml
      data-helpers.js
--    CellularDualSim.qml
++    DefaultSim.qml
      Sim.qml
      SimEditor.qml
+ )
 === added file 'plugins/cellular/Components/DefaultSim.qml'
 --- plugins/cellular/Components/DefaultSim.qml	1970-01-01 00:00:00 +0000
 +++ plugins/cellular/Components/DefaultSim.qml	2014-08-12 16:25:41 +0000
@@ -0,0 +1,69 @@
++/*
++ * 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 {
++
++    property var m: ["ask", sim1.path, sim2.path]
++
++    function getNameFromIndex (index) {
++        return [i18n.tr("Ask me each time"), sim1.title, sim2.title][index];
++    }
++
++    ListItem.ItemSelector {
++        id: callsDefaultSim
++        text: i18n.tr("For outgoing calls, use:")
++        expanded: true
++        model: m
++        delegate: OptionSelectorDelegate {
++            objectName: "defaultForCalls" + modelData
++            text: getNameFromIndex(index);
++        }
++        selectedIndex: m.indexOf(phoneSettings.defaultSimForCalls)
++        onDelegateClicked: {
++            phoneSettings.defaultSimForCalls = m[index];
++        }
++    }
++
++    ListItem.Caption {
++        text: i18n.tr("You can change the SIM for individual calls, or for contacts in the address book.")
++    }
++
++    ListItem.Divider {}
++
++    ListItem.ItemSelector {
++        id: messagesDefaultSim
++        text: i18n.tr("For messages, use:")
++        expanded: true
++        model: m
++        delegate: OptionSelectorDelegate {
++            objectName: "defaultForMessages" + modelData
++            text: getNameFromIndex(index);
++        }
++        selectedIndex: m.indexOf(phoneSettings.defaultSimForMessages)
++        onDelegateClicked: {
++            phoneSettings.defaultSimForMessages = m[index];
++
++        }
++    }
++}
++
 === modified file 'plugins/cellular/Components/SimEditor.qml'
 --- plugins/cellular/Components/SimEditor.qml	2014-07-31 15:35:41 +0000
 +++ plugins/cellular/Components/SimEditor.qml	2014-08-12 16:25:41 +0000
@@ -24,9 +24,12 @@
  Column {
      id: simList
++    objectName: "simEditor"
--    anchors.left: parent.left
--    anchors.right: parent.right
++    anchors {
++        left: parent.left
++        right: parent.right
++    }
      states: [
          State {
@@ -47,6 +50,10 @@
                  target: editor
                  parent: sim1Placeholder
+             }
++            PropertyChanges {
++                target: sim1Exp
++                expanded: true
++            }
          },
          State {
              extend: "editing"
@@ -59,6 +66,10 @@
                  target: editor
                  parent: sim2Placeholder
+             }
++            PropertyChanges {
++                target: sim2Exp
++                expanded: true
++            }
+         }
+     ]
@@ -66,37 +77,88 @@
          text: i18n.tr("Edit SIM Name")
+     }
--
--    ListItem.Standard {
--        id: sim1Item
--        text: sim1.title
--        objectName: "editSim1"
--        progression: true
--        onClicked: {
--            simList.state = "editingSim1";
--            nameField.forceActiveFocus();
--        }
--    }
--
--    Column {
--        id: sim1Placeholder
--    }
--
--    ListItem.Standard {
--        id: sim2Item
--        text: sim2.title
--        objectName: "editSim2"
--        progression: true
--        onClicked: {
--            simList.state = "editingSim2";
--            nameField.forceActiveFocus();
--        }
--    }
--
--    Column {
--        id: sim2Placeholder
--    }
--
++    ListItem.ExpandablesColumn {
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        height: expandedItem ?
++            childrenRect.height + editor.height : childrenRect.height
++
++        ListItem.Expandable {
++            id: sim1Exp
++            expandedHeight: sim1Col.height
++            objectName: "editSim1"
++            Column {
++                id: sim1Col
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                }
++                Item {
++                    anchors {
++                        left: parent.left
++                        right: parent.right
++                    }
++                    height: sim1Exp.collapsedHeight
++                    Label {
++                        objectName: "simLabel1"
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                            verticalCenter: parent.verticalCenter
++                        }
++                        text: sim1.title
++                    }
++                }
++                Column {
++                    id: sim1Placeholder
++                }
++            }
++            onClicked: {
++                simList.state = "editingSim1";
++                nameField.forceActiveFocus();
++            }
++        }
++
++        ListItem.Expandable {
++            id: sim2Exp
++            expandedHeight: sim2Col.height
++            objectName: "editSim2"
++            Column {
++                id: sim2Col
++                anchors {
++                    left: parent.left
++                    right: parent.right
++                }
++                Item {
++                    anchors {
++                        left: parent.left
++                        right: parent.right
++                    }
++                    height: sim2Exp.collapsedHeight
++                    Label {
++                        objectName: "simLabel2"
++                        anchors {
++                            left: parent.left
++                            right: parent.right
++                            verticalCenter: parent.verticalCenter
++                        }
++                        text: sim2.title
++                    }
++                }
++                Column {
++                    id: sim2Placeholder
++                }
++            }
++            onClicked: {
++                simList.state = "editingSim2";
++                nameField.forceActiveFocus();
++            }
++        }
++    }
++
++    // this column will be re-parented by a simList state change
      Column {
          id: editor
          visible: false
@@ -107,11 +169,6 @@
              horizontalCenter: simList.horizontalCenter
+         }
--        Item {
--            height: units.gu(0.1)
--            width: parent.width
--        }
--
          TextField {
              id: nameField
              objectName: "nameField"
@@ -145,6 +202,11 @@
+             }
+         }
++        Item {
++            height: units.gu(1)
++            width: parent.width
++        }
++
          Action {
              id: renameAction
              onTriggered: {
 === modified file 'plugins/cellular/PageComponent.qml'
 --- plugins/cellular/PageComponent.qml	2014-07-31 15:35:41 +0000
 +++ plugins/cellular/PageComponent.qml	2014-08-12 16:25:41 +0000
@@ -60,6 +60,7 @@
                      simTwoLoader.setSource("Components/Sim.qml", {
                          path: p
                      });
++                    defaultSimLoader.source = "Components/DefaultSim.qml";
+                 }
+             }
+         }
@@ -109,6 +110,7 @@
                  sim1: sim1,
                  sim2: sim2
              });
++            simEditorLoader.source = "Components/SimEditor.qml";
+         }
+     }
@@ -119,13 +121,11 @@
          boundsBehavior: (contentHeight > root.height) ? Flickable.DragAndOvershootBounds : Flickable.StopAtBounds
          Column {
--            anchors.left: parent.left
--            anchors.right: parent.right
++            anchors { left: parent.left; right: parent.right }
              Loader {
                  id: cellData
--                anchors.left: parent.left
--                anchors.right: parent.right
++                anchors { left: parent.left; right: parent.right }
+             }
              ListItem.SingleValue {
@@ -182,9 +182,17 @@
                  visible: showAllUI
+             }
--            SimEditor {
--                visible: root.state === "dualSim"
--                objectName: "simEditor"
++            Loader {
++                id: simEditorLoader
++                anchors { left: parent.left; right: parent.right }
++            }
++
++            ListItem.Divider {}
++
++            Loader {
++                id: defaultSimLoader
++                anchors.left: parent.left
++                anchors.right: parent.right
+             }
+         }
+     }
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/__init__.py'
 --- tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-07 09:52:19 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/__init__.py	2014-08-12 16:25:41 +0000
@@ -265,6 +265,26 @@
          super(UbuntuSystemSettingsOfonoTestCase, self).setUp(panel)
++    def set_default_for_calls(self, gsettings, default):
++        gsettings.set_value('default-sim-for-calls', default)
++        # wait for gsettings
++        sleep(1)
++
++    def set_default_for_messages(self, gsettings, default):
++        gsettings.set_value('default-sim-for-messages', default)
++        # wait for gsettings
++        sleep(1)
++
++    def get_default_sim_for_calls_selector(self, text):
++        return self.system_settings.main_view.cellular_page.select_single(
++            objectName="defaultForCalls" + text
++        )
++
++    def get_default_sim_for_messages_selector(self, text):
++        return self.system_settings.main_view.cellular_page.select_single(
++            objectName="defaultForMessages" + text
++        )
++
  class CellularBaseTestCase(UbuntuSystemSettingsOfonoTestCase):
      def setUp(self):
 === modified file 'tests/autopilot/ubuntu_system_settings/tests/test_cellular.py'
 --- tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-07-31 14:16:23 +0000
 +++ tests/autopilot/ubuntu_system_settings/tests/test_cellular.py	2014-08-12 16:25:41 +0000
@@ -251,12 +251,6 @@
          self.assert_selected_preference(2)
--    def test_that_sim_editor_is_hidden(self):
--        editor = self.system_settings.main_view.cellular_page.select_single(
--            objectName="simEditor"
--        )
--        self.assertFalse(editor.get_properties()['visible'])
--
  class DualSimCellularTestCase(CellularBaseTestCase):
@@ -330,8 +324,7 @@
      def get_sim_name(self, num):
          obj = self.system_settings.main_view.cellular_page.select_single(
--            objectName="simEditor"
--        ).select_single(objectName="editSim%d" % num)
++            objectName="simLabel%d" % num)
          return obj.get_properties()['text']
      def rename_sim(self, num, new_name):
@@ -562,3 +555,40 @@
              gsettings.set_value('sim-names', old_names)
              # wait for gsettings
              sleep(1)
++
++    def test_changing_default_sim_for_calls(self):
++        gsettings = Gio.Settings.new('com.ubuntu.phone')
++        default = gsettings.get_value('default-sim-for-calls')
++
++        self.addCleanup(
++            self.set_default_for_calls, gsettings, default)
++
++        # click ask
++        self.system_settings.main_view.scroll_to_and_click(
++            self.get_default_sim_for_calls_selector('ask'))
++        # click first sim
++        self.system_settings.main_view.scroll_to_and_click(
++            self.get_default_sim_for_calls_selector('/ril_0'))
++        # wait for gsettings
++        sleep(1)
++        self.assertEqual(
++            gsettings.get_value('default-sim-for-calls').get_string(),
++            '/ril_0')
++
++    def test_changing_default_sim_for_messages(self):
++        gsettings = Gio.Settings.new('com.ubuntu.phone')
++        default = gsettings.get_value('default-sim-for-messages')
++        self.addCleanup(
++            self.set_default_for_messages, gsettings, default)
++
++        # click ask
++        self.system_settings.main_view.scroll_to_and_click(
++            self.get_default_sim_for_messages_selector('ask'))
++        # click second sim
++        self.system_settings.main_view.scroll_to_and_click(
++            self.get_default_sim_for_messages_selector('/ril_1'))
++        # wait for gsettings
++        sleep(1)
++        self.assertEqual(
++            gsettings.get_value('default-sim-for-messages').get_string(),
++            '/ril_1')