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
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://bugs.launchpad.net/ubuntu-ux/+bug/1186181/comments/12 has background on why the code previously chose the 40% icon.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) wrote :

LGTM.

review: Approve
254. By Charles Kerr

sync with trunk.

255. By Charles Kerr

in debian/control, bump standards version from 3.9.2 to 3.9.5 to make lintian happy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches