Merge lp:~charlesk/indicator-power/show-phone-menu-in-phone-greeter into lp:indicator-power/15.04
| Status: | Merged |
|---|---|
| Approved by: | Michael Terry |
| Approved revision: | 274 |
| Merged at revision: | 273 |
| Proposed branch: | lp:~charlesk/indicator-power/show-phone-menu-in-phone-greeter |
| Merge into: | lp:indicator-power/15.04 |
| Diff against target: |
12 lines (+1/-1) 1 file modified
data/com.canonical.indicator.power (+1/-1) |
| To merge this branch: | bzr merge lp:~charlesk/indicator-power/show-phone-menu-in-phone-greeter |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Michael Terry | Approve | ||
|
Review via email:
|
|||
Commit message
Show the phone menu in the phone greeter.
Description of the change
Description of the Change:
As the name says, use the phone menu in the phone's greeter.
Previously we were telling phone_greeter to use desktop_greeter's menu. That's a less useful pairing than the phone menu for three reasons:
1. desktop_greeter doesn't provide the brightness slider/settings, which is useful on a phone greeter
2. The desktop greeter lists the attached batteries/devices, which is not useful on a phone
3. The menuitems in that list have an x-canonical-type of com.canonical.
===
Checklist:
> Are there any related MPs required for this MP to build/function as expected? Please list.
No
> 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, krillin + ubuntu-devel r46
> Did you provide a link to this page https:/
Yes
| PS Jenkins bot (ps-jenkins) wrote | # |
Works for me!