lp:~jonas-drange/ubuntu-system-settings/1319044-carrier-design-dual-sim

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-system-settings at revision 833

Ken VanDine: Approve on 2014-07-25

PS Jenkins bot: Approve (continuous-integration) on 2014-07-25

Diff: 1612 lines (+997/-320)

11 files modified

plugins/cellular/CMakeLists.txt (+5/-3)
plugins/cellular/Components/CMakeLists.txt (+7/-0)
plugins/cellular/Components/CellularDualSim.qml (+154/-0)
plugins/cellular/Components/CellularSingleSim.qml (+100/-0)
plugins/cellular/Components/Sim.qml (+61/-0)
plugins/cellular/Components/data-helpers.js (+22/-90)
plugins/cellular/PageChooseCarrier.qml (+70/-52)
plugins/cellular/PageChooseCarriers.qml (+77/-0)
plugins/cellular/PageComponent.qml (+92/-104)
tests/autopilot/ubuntu_system_settings/tests/__init__.py (+110/-38)
tests/autopilot/ubuntu_system_settings/tests/test_cellular.py (+299/-33)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

790. By Jonas G. Drange on 2014-07-25

making sure radio preference changes does not override user selection

789. By Jonas G. Drange on 2014-07-24

remove test test

788. By Jonas G. Drange on 2014-07-24

fix connman error

787. By Jonas G. Drange on 2014-07-24

remove debug, do netreg in SIM

786. By Jonas G. Drange on 2014-07-23

modem -> sim, uncommenting flickable

785. By Jonas G. Drange on 2014-07-23

removing thindivider

784. By Jonas G. Drange on 2014-07-23

killing sleeps by using eventually

783. By Jonas G. Drange on 2014-07-22

letting ui change propogate to dbus using 0.7 seconds sleep

782. By Jonas G. Drange on 2014-07-22

trying longer sleeping times for tests to pass on mako

781. By Jonas G. Drange on 2014-07-22

upping sleep time to make tests pass on mako