Merge lp://staging/~charlesk/indicator-power/lp-1186181-icon-should-match-battery-percentage into lp://staging/indicator-power/14.10
Proposed by
Charles Kerr
Status: | Merged |
---|---|
Approved by: | Antti Kaijanmäki |
Approved revision: | 253 |
Merged at revision: | 256 |
Proposed branch: | lp://staging/~charlesk/indicator-power/lp-1186181-icon-should-match-battery-percentage |
Merge into: | lp://staging/indicator-power/14.10 |
Diff against target: |
77 lines (+9/-23) 3 files modified
debian/control (+1/-1) src/device.c (+0/-14) tests/test-device.cc (+8/-8) |
To merge this branch: | bzr merge lp://staging/~charlesk/indicator-power/lp-1186181-icon-should-match-battery-percentage |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antti Kaijanmäki (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+228692@code.staging.launchpad.net |
Commit message
Choose the icon that's closest to the current battery charge percentage
Description of the change
Choose the icon that's closest to the current battery charge percentage.
This patch removes code that chose the "40% charge" icon if >30 minutes were left on the battery, no matter how low the actual % charge was. This can be confusing now that we actually show the numeric percentage as well.
https:/
To post a comment you must log in.
PASSED: Continuous integration, rev:253 jenkins. qa.ubuntu. com/job/ indicator- power-ci/ 121/ jenkins. qa.ubuntu. com/job/ indicator- power-utopic- amd64-ci/ 22 jenkins. qa.ubuntu. com/job/ indicator- power-utopic- armhf-ci/ 22 jenkins. qa.ubuntu. com/job/ indicator- power-utopic- armhf-ci/ 22/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- power-ci/ 121/rebuild
http://