lp://staging/~ken-vandine/ubuntu-system-settings/rtm-lp1391940

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu-system-settings/rtm-14.09 at revision 942

Antti Kaijanmäki (community): Approve on 2014-11-13

Ubuntu Touch System Settings: Pending requested 2014-11-12

Diff: 163 lines (+23/-46)

4 files modified

plugins/battery/CMakeLists.txt (+2/-2)
plugins/battery/PageComponent.qml (+21/-6)
plugins/battery/battery.cpp (+0/-28)
plugins/battery/battery.h (+0/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1391940: Battery page must not use NM WifiEnabled property to disable Wi-Fi

Undecided

Invalid

Link a bug report

Related blueprints

939. By Ken VanDine on 2014-11-12

[battery] don't control wifi state with libnm, use the QDBusActionGroup from indicator-network

938. By Ken VanDine on 2014-11-12

Revert adding Binding for data roaming, just needed to fix reference to poweredSim

937. By Ken VanDine on 2014-11-12

Binding for data roaming switch

936. By Ken VanDine on 2014-11-10

Backport fix for check/switch binding

935. By PS Jenkins bot on 2014-11-04

Releasing 0.3+14.10.20141104~rtm-0ubuntu1

934. By Ken VanDine on 2014-11-04

[battery] don't use a colored icon
 Fixes: 1351383
Approved by: Sebastien Bacher

933. By PS Jenkins bot on 2014-11-03

Releasing 0.3+14.10.20141103~rtm-0ubuntu1

932. By Michael Terry on 2014-11-03

Add a Continue button when choosing a passphrase. And fix a few other design nits with choosing a password.

Specifically:
 - Add a Continue button on the passphrase screens
 - Remove the Skip button on the first passcode screen
 - Fix phrasing of "4 numbers" to "4 digits only"
 - When pressing Back on the Wi-Fi screen, go to "Lock security" page instead of the "Choose a password" page.

Visual designs here: https://drive.google.com/a/canonical.com/folderview?id=0B8I8ZVKH-8SsM1QyMmhWbkpRLTg

This branch requires a change in the unity8 Lockscreen component that exposes the passphrase content to us. Thus, I've bumped the required unity8 version. Fixes: 1383702

931. By PS Jenkins bot on 2014-10-29

Releasing 0.3+14.10.20141029~rtm-0ubuntu1

930. By Ken VanDine on 2014-10-29

* Refactored to use a singleton for UpdateManager shared in both QML and CPP.
* Don't load the dynamic visibility items while creating the item model, defer that to the loader. Fixes: 1317007