Merge lp://staging/~jonas-drange/ubuntu-system-settings/apl into lp://staging/ubuntu-system-settings
Proposed by
Jonas G. Drange
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 1767 |
Merged at revision: | 1754 |
Proposed branch: | lp://staging/~jonas-drange/ubuntu-system-settings/apl |
Merge into: | lp://staging/ubuntu-system-settings |
Prerequisite: | lp://staging/~jonas-drange/ubuntu-system-settings/lp1644268 |
Diff against target: |
2257 lines (+770/-248) 59 files modified
debian/control (+1/-1) plugins/about/DevMode.qml (+3/-1) plugins/about/PageComponent.qml (+6/-6) plugins/about/Software.qml (+3/-1) plugins/about/Storage.qml (+2/-5) plugins/background/MainPage.qml (+13/-18) plugins/background/Preview.qml (+2/-2) plugins/battery/PageComponent.qml (+6/-6) plugins/bluetooth/DevicePage.qml (+12/-7) plugins/bluetooth/PageComponent.qml (+11/-3) plugins/brightness/PageComponent.qml (+3/-2) plugins/brightness/WifiDisplays.qml (+1/-0) plugins/cellular/Components/MultiSim.qml (+3/-4) plugins/cellular/Components/SingleSim.qml (+2/-3) plugins/cellular/PageApnEditor.qml (+1/-2) plugins/cellular/PageCarrierAndApn.qml (+6/-3) plugins/cellular/PageCarriersAndApns.qml (+6/-3) plugins/cellular/PageChooseApn.qml (+9/-6) plugins/cellular/PageChooseCarrier.qml (+1/-1) plugins/cellular/PageComponent.qml (+1/-0) plugins/hotspot/PageComponent.qml (+1/-0) plugins/language/KeyboardLayouts.qml (+1/-0) plugins/language/PageComponent.qml (+15/-27) plugins/language/PageHardwareKeyboard.qml (+8/-4) plugins/language/SpellChecking.qml (+2/-0) plugins/launcher/PageComponent.qml (+1/-0) plugins/notifications/PageComponent.qml (+11/-8) plugins/phone/CallForwarding.qml (+1/-1) plugins/phone/MultiSim.qml (+19/-13) plugins/phone/Services.qml (+6/-1) plugins/phone/SingleSim.qml (+7/-4) plugins/security-privacy/AppAccess.qml (+20/-13) plugins/security-privacy/AppAccessControl.qml (+2/-0) plugins/security-privacy/Location.qml (+1/-1) plugins/security-privacy/PageComponent.qml (+29/-41) plugins/security-privacy/PhoneLocking.qml (+5/-2) plugins/security-privacy/SimPin.qml (+2/-0) plugins/security-privacy/here-terms.qml (+1/-0) plugins/sound/PageComponent.qml (+8/-7) plugins/sound/SoundsList.qml (+3/-5) plugins/system-update/PageComponent.qml (+2/-1) plugins/time-date/ChooseTimeZone.qml (+1/-1) plugins/time-date/PageComponent.qml (+5/-3) plugins/vpn/PageComponent.qml (+4/-2) plugins/wifi/AccessPoint.qml (+3/-9) plugins/wifi/PageComponent.qml (+4/-2) plugins/wifi/PreviousNetworks.qml (+7/-5) src/SystemSettings/CMakeLists.txt (+1/-0) src/SystemSettings/ItemPage.qml (+21/-2) src/SystemSettings/USSAdaptivePageLayout.qml (+40/-0) src/SystemSettings/qmldir (+1/-0) src/qml/CategorySection.qml (+14/-2) src/qml/MainWindow.qml (+61/-11) src/qml/UncategorizedItemsView.qml (+13/-4) tests/autopilot/ubuntu_system_settings/tests/__init__.py (+1/-0) tests/mocks/SystemSettings/MockPluginManager.cpp (+113/-4) tests/mocks/SystemSettings/MockPluginManager.h (+52/-0) tests/mocks/SystemSettings/qmldir (+1/-0) tests/plugins/main/tst_MainWindow.qml (+191/-1) |
To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/apl |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
system-apps-ci-bot | continuous-integration | Approve | |
Review via email:
|
Commit message
migrates uss to apl
To post a comment you must log in.
PASSED: Continuous integration, rev:1760 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/279/ /jenkins. canonical. com/system- apps/job/ build/2193 /jenkins. canonical. com/system- apps/job/ test-0- autopkgtest/ label=phone- armhf,release= vivid+overlay, testname= default/ 566 /jenkins. canonical. com/system- apps/job/ build-0- fetch/2196 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/2023/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/2023/ artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 2023/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2023 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/2023/ artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/279/ rebuild
https:/