Merge lp:~albaguirre/gsettings-ubuntu-touch-schemas/fix-1230345 into lp:gsettings-ubuntu-touch-schemas

[Alberto Aguirre]

Add inactivity timeout keys for screen dimming and power-off.

Add inactivity timeout keys for screen dimming and power-off.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/37/rebuild

review: Approve (continuous-integration)

[lp:~albaguirre/gsettings-ubuntu-touch-schemas/fix-1230345]

43. By Alberto Aguirre on 2014-08-15

Update changelog

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:43
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/38/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

You should drop the debian/changelog entry and in other packages that you need to depend on this change bump the depends to > 0.0.2+14.10.20140813

review: Needs Fixing

[lp:~albaguirre/gsettings-ubuntu-touch-schemas/fix-1230345]

44. By Alberto Aguirre on 2014-08-15

Drop changelog entry

[Alberto Aguirre (albaguirre)]

> You should drop the debian/changelog entry and in other packages that you need
> to depend on this change bump the depends to > 0.0.2+14.10.20140813

Done.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-armhf-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gsettings-ubuntu-touch-schemas-utopic-i386-ci/19

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gsettings-ubuntu-touch-schemas-ci/39/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Thanks, looks good.

review: Approve

=== modified file 'schemas/com.ubuntu.touch.system.gschema.xml.in.in'
--- schemas/com.ubuntu.touch.system.gschema.xml.in.in	2014-08-12 18:00:06 +0000
+++ schemas/com.ubuntu.touch.system.gschema.xml.in.in	2014-08-15 18:59:19 +0000
@@ -28,5 +28,15 @@
     light levels.
       </_description>
     </key>
+    <key name="activity-timeout" type="u">
+      <range min="0" max="3600"/>
+      <default>60</default>
+      <summary>Timeout in seconds for turning off the screen if there is no user activity. A value of 0 disables it.</summary>
+    </key>
+    <key name="dim-timeout" type="u">
+      <range min="0" max="3600"/>
+      <default>45</default>
+      <summary>Timeout in seconds for dimming the screen if there is no user activity. A value of 0 disables auto-dimming.</summary>
+    </key>
   </schema>
 </schemalist>