Unity 8

Merge lp:~afrantzis/unity8/power-state-change-reason-snap-decision into lp:unity8

power-state-change-reason-snap-decision
Merge into trunk

Proposed by Alexandros Frantzis on 2015-09-24

Status:

Merged

Approved by:

Lukáš Tinkl on 2015-09-30

Approved revision:

1989

Merged at revision:

1992

Proposed branch:

lp:~afrantzis/unity8/power-state-change-reason-snap-decision

Merge into:

lp:unity8

Diff against target:

25 lines (+3/-1)

2 files modified

plugins/Powerd/Powerd.h (+2/-0)
qml/Notifications/Notification.qml (+1/-1)

To merge this branch:

bzr merge lp:~afrantzis/unity8/power-state-change-reason-snap-decision

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2015-10-01
Lukáš Tinkl (community)		2015-09-24	Approve on 2015-09-30
Review via email: mp+272233@code.launchpad.net

Commit Message

Use power state change reason SnapDecision to turn screen on when a SnapDecision arrives

Using this value allows USC to handle proximity correctly for snap decision prompts.

Description of the Change

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

https://code.launchpad.net/~afrantzis/unity-system-compositor/voice-call-proximity/+merge/272744

but this MP can be built and run without the USC changes fine, we just won't get the improved proximity handling.

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

yes

* Did you make sure that your branch does not contain spurious tags?

yes

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

n/a

* If you changed the UI, has there been a design review?

n/a

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6381/rebuild

review: Approve (continuous-integration)

Lukáš Tinkl (lukas-kde) wrote on 2015-09-30:

What about the "call_done" enum value that you introduced in https://code.launchpad.net/~afrantzis/unity-system-compositor/voice-call-proximity/+merge/272744? Shouldn't this be added here as well to avoid future breakage?

Otherwise the change looks good to me

review: Needs Information

Alexandros Frantzis (afrantzis) wrote on 2015-09-30:

Unity8 doesn't need to know about this value (at the moment), but I have no problem adding it if it's preferred to have fully synced enumerations.

Lukáš Tinkl (lukas-kde) wrote on 2015-09-30:

I would personally prefer these values to stay in sync

lp:~afrantzis/unity8/power-state-change-reason-snap-decision updated on 2015-09-30

1989. By Alexandros Frantzis on 2015-09-30: Add power state change reason "CallDone" for enum completeness

Alexandros Frantzis (afrantzis) wrote on 2015-09-30:

> I would personally prefer these values to stay in sync

Fixed.

Lukáš Tinkl (lukas-kde) wrote on 2015-09-30:

LGTM

review: Approve

PS Jenkins bot (ps-jenkins) wrote on 2015-09-30:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6388/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2015-10-01:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6398/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alexandros Frantzis

Mohammad Rakibul Hasan

Unity Team

1	=== modified file 'plugins/Powerd/Powerd.h'
2	--- plugins/Powerd/Powerd.h 2015-08-10 22:29:28 +0000
3	+++ plugins/Powerd/Powerd.h 2015-09-30 12:23:25 +0000
4	@@ -38,6 +38,8 @@
5	PowerKey = 2, // Display changed state due to user pressing power key
6	Proximity = 3, // Display changed state due to proximity events
7	Notification = 4, // Display changed state due to user notification
8	+ SnapDecision = 5, // Display changed state due to snap decision prompt
9	+ CallDone = 6, // Display changed state due to voice call end
10	};
11
12	enum Status {
13
14	=== modified file 'qml/Notifications/Notification.qml'
15	--- qml/Notifications/Notification.qml 2015-09-23 11:16:10 +0000
16	+++ qml/Notifications/Notification.qml 2015-09-30 12:23:25 +0000
17	@@ -90,7 +90,7 @@
18	// Turn on screen as needed (Powerd.Notification means the screen
19	// stays on for a shorter amount of time)
20	if (type == Notification.SnapDecision) {
21	- Powerd.setStatus(Powerd.On, Powerd.Unknown);
22	+ Powerd.setStatus(Powerd.On, Powerd.SnapDecision);
23	} else if (type != Notification.Confirmation) {
24	Powerd.setStatus(Powerd.On, Powerd.Notification);
25	}