Merge lp:~albaguirre/unity-system-compositor/fix-1483127 into lp:unity-system-compositor

[Alberto Aguirre]

Allow proximity to turn on screen.

Allow proximity events to turn on screen only if the power key has not turned off the screen. A user may be on a call that is longer that the screen timeout but at the end of the call a far proximity event should still be able to turn the screen on.

Allow proximity to turn on screen.

Allow proximity events to turn on screen only if the power key has not turned off the screen. A user may be on a call that is longer that the screen timeout but at the end of the call a far proximity event should still be able to turn the screen on.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:245
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/265/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-amd64-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-wily-i386-ci/53

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/265/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

=== modified file 'src/mir_screen.cpp'
--- src/mir_screen.cpp	2015-08-18 13:14:49 +0000
+++ src/mir_screen.cpp	2015-08-21 23:58:15 +0000
@@ -175,7 +175,7 @@
     if (reason != PowerStateChangeReason::proximity)
     {
         screen_hardware->enable_proximity(false);
-        allow_proximity_to_turn_on_screen = false;
+        allow_proximity_to_turn_on_screen = reason != PowerStateChangeReason::power_key;
     }
 
     if (current_power_mode == mode)
@@ -226,7 +226,11 @@
 void usc::MirScreen::cancel_timers_l(PowerStateChangeReason reason)
 {
     if (reason == PowerStateChangeReason::proximity)
+    {
+        next_power_off = {};
+        next_dimming = {};
         return;
+    }
 
     power_off_alarm->cancel();
     dimmer_alarm->cancel();
@@ -242,7 +246,7 @@
 
 void usc::MirScreen::reset_timers_ignoring_power_mode_l(PowerStateChangeReason reason)
 {
-    if (!restart_timers || reason == PowerStateChangeReason::proximity)
+    if (!restart_timers)
         return;
 
     auto const timeouts = timeouts_for(reason);
@@ -289,7 +293,7 @@
 
 usc::MirScreen::Timeouts usc::MirScreen::timeouts_for(PowerStateChangeReason reason)
 {
-    if (reason == PowerStateChangeReason::notification)
+    if (reason == PowerStateChangeReason::notification || reason == PowerStateChangeReason::proximity)
         return notification_timeouts;
     else
         return inactivity_timeouts;
 
=== modified file 'tests/unit-tests/test_mir_screen.cpp'
--- tests/unit-tests/test_mir_screen.cpp	2015-08-18 12:20:56 +0000
+++ tests/unit-tests/test_mir_screen.cpp	2015-08-21 23:58:15 +0000
@@ -584,7 +584,7 @@
     verify_and_clear_expectations();
 }
 
-TEST_F(AMirScreen, proximity_requests_do_not_reset_timeouts)
+TEST_F(AMirScreen, proximity_requests_use_short_timeouts)
 {
     // At T=0 we turn the screen on, and normal inactivity timeouts
     // are reset
@@ -603,16 +603,16 @@
 
     verify_and_clear_expectations();
 
-    // At T=50 screen should be dimmed due to the inactivity
+    // At T=52 screen should be dimmed due to the short inactivity
     // dimming timeout
     expect_screen_is_turned_dim();
-    timer->advance_by(ten_seconds);
+    timer->advance_by(notification_dimmer_timeout);
     verify_and_clear_expectations();
 
-    // At T=60 the screen should turn off due to the normal
+    // At T=55 the screen should turn off due to the short
     // inactivity timeout
     expect_screen_is_turned_off();
-    timer->advance_by(ten_seconds);
+    timer->advance_by(std::chrono::seconds{3});
 }
 
 TEST_F(AMirScreen, does_not_turn_on_screen_when_notification_arrives_with_phone_covered)
@@ -779,3 +779,51 @@
     timer->advance_by(ten_hours);
     verify_and_clear_expectations();
 }
+
+TEST_F(AMirScreen, proximity_can_turn_on_screen_after_power_off_timeout)
+{
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                     PowerStateChangeReason::power_key);
+
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_off,
+                                     PowerStateChangeReason::proximity);
+
+    timer->advance_by(power_off_timeout);
+
+    expect_screen_is_turned_on();
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                     PowerStateChangeReason::proximity);
+    verify_and_clear_expectations();
+
+    expect_screen_is_turned_off();
+
+    timer->advance_by(power_off_timeout);
+}
+
+TEST_F(AMirScreen, proximity_cannot_turn_on_screen_if_power_key_was_used)
+{
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                     PowerStateChangeReason::power_key);
+
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_off,
+                                     PowerStateChangeReason::power_key);
+
+    //timer->advance_by(power_off_timeout);
+
+    expect_no_reconfiguration();
+    mir_screen.set_screen_power_mode(
+        MirPowerMode::mir_power_mode_on,
+        PowerStateChangeReason::proximity);
+    verify_and_clear_expectations();
+
+    expect_no_reconfiguration();
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_off,
+                                     PowerStateChangeReason::proximity);
+
+    verify_and_clear_expectations();
+
+    expect_no_reconfiguration();
+    mir_screen.set_screen_power_mode(MirPowerMode::mir_power_mode_on,
+                                     PowerStateChangeReason::proximity);
+
+}