Merge lp://staging/~charlesk/indicator-power/lp-1388235-use-new-battery-icons into lp://staging/indicator-power/15.04

Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 278
Merged at revision: 278
Proposed branch: lp://staging/~charlesk/indicator-power/lp-1388235-use-new-battery-icons
Merge into: lp://staging/indicator-power/15.04
Diff against target: 207 lines (+60/-6)
3 files modified
src/device.c (+32/-3)
tests/manual (+8/-1)
tests/test-device.cc (+20/-2)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-power/lp-1388235-use-new-battery-icons
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+246232@code.staging.launchpad.net

Commit message

Use the new power level icons for a more accurate display of the battery level.

Description of the change

== Change Description

The new power level icons added in lp:~tiheum/ubuntu-themes/white-indicators let us show better power level accuracy, so round to the closest 10% instead of closest 20%.

As a special case, since 20% shows 'critical' red, for 21-29% let's round up to the 30% icon so that we don't show critical red when we're at 25%.

Power level can be tested manually with a mock battery; see https://wiki.ubuntu.com/Process/Merges/TestPlan/indicator-power "Notes on Battery Testing"

== Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

Works best with lp:~tiheum/ubuntu-themes/white-indicators, but uses the existing icon names as fallbacks so it should "fail gracefully" back to the old icons when not on mobile

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> Did your component test plan pass? If on a device, what image number?

1. 14.10 krillin r191
2. 15.03 nexus 4 r63

> Please list which manual tests are germane for the reviewer in this MR.

indicator-power/low-power-icon

> Did you provide a link to this page https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-power

Yes

To post a comment you must log in.
277. By Charles Kerr

fix fencepost error s.t. 20% actually uses battery-020

278. By Charles Kerr

update manual tests

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

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