Merge lp:~afrantzis/unity-system-compositor/fix-1473979-power-key-inactivity-timers into lp:unity-system-compositor

[Alexandros Frantzis]

Ensure inactivity timers are enabled when turning the screen on using the power button

Ensure inactivity timers are enabled when turning the screen on using the power button

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM

review: Approve

=== modified file 'src/screen_event_handler.cpp'
--- src/screen_event_handler.cpp	2015-04-29 14:39:19 +0000
+++ src/screen_event_handler.cpp	2015-07-13 12:38:29 +0000
@@ -80,7 +80,7 @@
     std::lock_guard<std::mutex> lock{guard};
 
     mode_at_press_start = screen->get_screen_power_mode();
-    if (mode_at_press_start == MirPowerMode::mir_power_mode_off)
+    if (mode_at_press_start != MirPowerMode::mir_power_mode_on)
     {
         screen->set_screen_power_mode(
             MirPowerMode::mir_power_mode_on, PowerStateChangeReason::power_key);
@@ -98,10 +98,17 @@
     shutdown_alarm->cancel();
     long_press_alarm->cancel();
 
-    if (mode_at_press_start == MirPowerMode::mir_power_mode_on && !long_press_detected)
+    if (!long_press_detected)
     {
-        screen->set_screen_power_mode(
-            MirPowerMode::mir_power_mode_off, PowerStateChangeReason::power_key);
+        if (mode_at_press_start == MirPowerMode::mir_power_mode_on)
+        {
+            screen->set_screen_power_mode(
+                MirPowerMode::mir_power_mode_off, PowerStateChangeReason::power_key);
+        }
+        else
+        {
+            screen->enable_inactivity_timers(true);
+        }
     }
 }
 

=== modified file 'tests/unit-tests/test_screen_event_handler.cpp'
--- tests/unit-tests/test_screen_event_handler.cpp	2015-06-03 17:17:37 +0000
+++ tests/unit-tests/test_screen_event_handler.cpp	2015-07-13 12:38:29 +0000
@@ -98,6 +98,7 @@
     AdvanceableTimer timer;
     std::chrono::milliseconds const power_key_ignore_timeout{5000};
     std::chrono::milliseconds const shutdown_timeout{10000};
+    std::chrono::milliseconds const normal_press_duration{100};
     testing::NiceMock<MockScreen> mock_screen;
     std::atomic<bool> shutdown_called{false};
     usc::ScreenEventHandler screen_event_handler{
@@ -168,8 +169,6 @@
 
 TEST_F(AScreenEventHandler, sets_screen_mode_off_normal_press_release)
 {
-    std::chrono::milliseconds const normal_press_duration{100};
-
     EXPECT_CALL(mock_screen,
                 set_screen_power_mode(MirPowerMode::mir_power_mode_off,
                                       PowerStateChangeReason::power_key));
@@ -208,3 +207,19 @@
     EXPECT_FALSE(screen_event_handler.handle(*touch_event));
     EXPECT_FALSE(screen_event_handler.handle(*pointer_event));
 }
+
+TEST_F(AScreenEventHandler, disables_inactivity_timers_on_power_key_down)
+{
+    EXPECT_CALL(mock_screen, enable_inactivity_timers(false));
+
+    press_power_key();
+}
+
+TEST_F(AScreenEventHandler, enables_inactivity_timers_on_power_key_up_when_turning_screen_on)
+{
+    press_power_key();
+    timer.advance_by(normal_press_duration);
+
+    EXPECT_CALL(mock_screen, enable_inactivity_timers(true));
+    release_power_key();
+}