lp:~phablet-team/ubuntu-system-settings/main_list_view

Branch merges

Propose for merging

No branches dependent on this one.

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

system-apps-ci-bot: Needs Fixing (continuous-integration) on 2016-12-05

Jonas G. Drange (community): Approve on 2016-12-05

Ken VanDine: Approve on 2016-12-02

Diff: 1007 lines (+403/-324)

23 files modified

plugins/about/EntryComponent.qml (+5/-19)
plugins/flight-mode/EntryComponent.qml (+22/-31)
plugins/orientation-lock/EntryComponent.qml (+18/-29)
plugins/system-update/EntryComponent.qml (+5/-2)
src/CMakeLists.txt (+0/-1)
src/qml/CategoryGrid.qml (+0/-90)
src/qml/EntryComponent.qml (+5/-49)
src/qml/MainWindow.qml (+59/-35)
src/ui.qrc (+0/-1)
tests/CMakeLists.txt (+2/-0)
tests/autopilot/ubuntu_system_settings/__init__.py (+0/-7)
tests/autopilot/ubuntu_system_settings/tests/test_search.py (+0/-55)
tests/mocks/CMakeLists.txt (+1/-0)
tests/mocks/SystemSettings/CMakeLists.txt (+20/-0)
tests/mocks/SystemSettings/ListItems/qmldir (+9/-0)
tests/mocks/SystemSettings/MockPluginManager.cpp (+50/-0)
tests/mocks/SystemSettings/MockPluginManager.h (+50/-0)
tests/mocks/SystemSettings/plugin.cpp (+28/-0)
tests/mocks/SystemSettings/plugin.h (+32/-0)
tests/mocks/SystemSettings/qmldir (+8/-0)
tests/plugins/CMakeLists.txt (+8/-2)
tests/plugins/main/tst_MainWindow.qml (+77/-0)
tests/plugins/system-update/tst_systemupdate_entrycomponent.qml (+4/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1737. By Jonas G. Drange on 2016-12-05

fix broken SystemSettings.ListItems mock

1736. By Jonas G. Drange on 2016-12-05

syncs with trunk

1735. By Jonas G. Drange on 2016-12-02

remove colors

1734. By Jonas G. Drange on 2016-12-01

adds utils as test import path

1733. By Jonas G. Drange on 2016-12-01

completely remove categorygrid, color ubuntu icon

1732. By Jonas G. Drange on 2016-12-01

adds test for new search header

1731. By Jonas G. Drange on 2016-11-29

uses pageheader to implement improved uss search

1730. By Jonas G. Drange on 2016-11-29

fixes height of remaining entrycomponents

1729. By Ken VanDine on 2016-10-14

Replace the grid with a list

1728. By CI Train Bot Account on 2016-09-30

Releasing 0.4+16.10.20160930.1-0ubuntu1