Merge lp://staging/~charlesk/indicator-power/lp-1289465-make-brightness-icons-consistent-with-system-settings into lp://staging/indicator-power/15.04

Proposed by Charles Kerr
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 282
Merged at revision: 280
Proposed branch: lp://staging/~charlesk/indicator-power/lp-1289465-make-brightness-icons-consistent-with-system-settings
Merge into: lp://staging/indicator-power/15.04
Diff against target: 27 lines (+9/-2)
1 file modified
src/service.c (+9/-2)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-power/lp-1289465-make-brightness-icons-consistent-with-system-settings
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Alejandro J. Cura (community) Approve
Review via email: mp+254821@code.staging.launchpad.net

Commit message

For the brightness slider, use the same left & right icons as ubunu-system-settings

Description of the change

== Description of the Change

For the brightness slider, use the same left & right icons as ubunu-system-settings.

== Checklist

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

Yes:
https://code.launchpad.net/~charlesk/ubuntu-themes/lp-1289465-add-display-brightness-icons-to-ubuntu-mobile/+merge/254820

> 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?

mako vivid r150

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

This is a one-off, so putting the test here in the MP:

Steps:
1. Pull down battery indicator's menu
2. Make a note of the icons on the brightness slider
3. Click on "Battery settings..."
4. In the "Battery settings" page, click on "Display brightness"
5. Make a note of the icons on the brightness slider

Expected Results:
The icons in steps 2 and 5 should be the same.

> 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.
282. By Charles Kerr

oops, forgot to commit this tyop fix before pushing

Revision history for this message
Alejandro J. Cura (alecu) wrote :

Looks good

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Antti Kaijanmäki (kaijanmaki) :
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