Merge lp:~ken-vandine/ubuntu-system-settings/dim-timeout-1437510 into lp:ubuntu-system-settings

[Ken VanDine]

Ensure dim-timeout is 10 seconds less than activity-timeout

Ensure dim-timeout is 10 seconds less than activity-timeout

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1389
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2065/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2316
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2316/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19762

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2065/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks Ken, that looks fine as a workaround, as you wrote on the bug ideally the system would do that for us. Not sure about the minimum value, we could just ensure it's > 10 as well, but I don't think it really makes a difference either way

review: Approve

=== modified file 'plugins/battery/SleepValues.qml'
--- plugins/battery/SleepValues.qml	2015-01-30 18:09:06 +0000
+++ plugins/battery/SleepValues.qml	2015-04-17 15:26:50 +0000
@@ -45,12 +45,16 @@
         id: powerSettings
         schema.id: usePowerd ? "com.ubuntu.touch.system" : "org.gnome.desktop.session"
         onChanged: {
-            if (key == "activityTimeout" || key == "idleDelay")
+            if (key == "activityTimeout" || key == "idleDelay") {
                 var curIndex = idleValues.indexOf(value)
                 if( curIndex != -1)
                     sleepSelector.selectedIndex = curIndex
                 else if(value === 0)
                     sleepSelector.selectedIndex = 6
+                // ensure dimTimeout is 10 seconds less than activityTimeout
+                if (usePowerd)
+                    dimTimeout = Math.max(activityTimeout - 10, 50)
+            }
         }
         Component.onCompleted: {
             if (usePowerd)
 
=== modified file 'tests/autopilot/ubuntu_system_settings/tests/test_security.py'
--- tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-02-19 15:18:09 +0000
+++ tests/autopilot/ubuntu_system_settings/tests/test_security.py	2015-04-17 15:26:50 +0000
@@ -62,6 +62,14 @@
             prev = gsettings.get_uint('idle-delay')
             return prev
 
+    def _get_dim_timeout(self):
+        if self.use_powerd:
+            gsettings = Gio.Settings.new('com.ubuntu.touch.system')
+            prev = gsettings.get_uint('dim-timeout')
+            return prev
+        else:
+            return None
+
     def _go_to_phone_lock(self):
         selector = self.security_page.select_single(
             objectName='lockingControl'
@@ -112,6 +120,7 @@
 
     def test_locking_control_value(self):
         actTimeout = self._get_activity_timeout()
+        dimTimeout = self._get_dim_timeout()
         activityTimeout = self.security_page.select_single(
             objectName='lockingControl').value
         if actTimeout is 0:
@@ -120,10 +129,14 @@
             self.assertEquals(
                 activityTimeout,
                 ('After {:d} minute').format(int(actTimeout/60)))
+            if dimTimeout:
+                self.assertEquals(dimTimeout, actTimeout - 10)
         else:
             self.assertEquals(
                 activityTimeout,
                 ('After {:d} minutes').format(int(actTimeout/60)))
+            if dimTimeout:
+                self.assertEquals(dimTimeout, actTimeout - 10)
 
     def test_phone_lock_page(self):
         self._go_to_phone_lock()