Merge lp://staging/~charlesk/indicator-bluetooth/lp-1126108 into lp://staging/indicator-bluetooth/14.04

Proposed by Charles Kerr
Status: Merged
Approved by: Lars Karlitski
Approved revision: 81
Merged at revision: 77
Proposed branch: lp://staging/~charlesk/indicator-bluetooth/lp-1126108
Merge into: lp://staging/indicator-bluetooth/14.04
Diff against target: 143 lines (+37/-7)
4 files modified
src/bluetooth.vala (+3/-0)
src/bluez.vala (+22/-1)
src/desktop.vala (+2/-2)
src/profile.vala (+10/-4)
To merge this branch: bzr merge lp://staging/~charlesk/indicator-bluetooth/lp-1126108
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+198095@code.staging.launchpad.net

Description of the change

Gets us a little closer to the spec in two ways:

1. Indicator Visibility

On the desktop, the indicator's header icon is visible whenever a default adapter is available (whether the adapter is powered or not) and the user's preference settings call for a visible Bluetooth indicator.

On the phone, the indicator's header icon is visible whenever a default adapter is available *and* the adapter is powered.

2. Header Icon

If Bluetooth is off, the header icon now uses the "bluetooth-disabled" icon.
If Bluetooth is on, it now uses the "bluetooth-active" icon.
If Bluetooth is on and has a connected device, it now uses the "bluetooth-paired" icon.

To post a comment you must log in.
Revision history for this message
Lars Karlitski (larsu) wrote :

Sounds about right ;)

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

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