Merge lp:~seb128/ubuntu-system-settings/security-locking-label into lp:ubuntu-system-settings

[Sebastien Bacher]

[security-privacy] rename the "Lock phone" item to "Locking and unlocking"
and do not include the screen delay as a value, it misleads users to think
that the section is only about that where it also includes security options

[security-privacy] rename the "Lock phone" item to "Locking and unlocking"
and do not include the screen delay as a value, it misleads users to think
that the section is only about that where it also includes security options

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1507
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2332/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/107
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/516
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3820
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3820/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22743

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

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

Works for me and fixes an annoying nit with the UI. :)

review: Approve

[Michael Terry (mterry)]

(Maybe also worth cleaning up the filename PhoneLocking.qml, but not a big deal)

[Ken VanDine (ken-vandine)]

yay, removing code!

review: Approve

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2015-05-21 13:32:41 +0000
+++ plugins/security-privacy/PageComponent.qml	2015-08-21 08:04:36 +0000
@@ -117,27 +117,7 @@
             ListItem.SingleValue {
                 id: lockingControl
                 objectName: "lockingControl"
-                text: i18n.tr("Lock phone")
-                value: {
-                    if (batteryBackend.powerdRunning ) {
-                        var timeout = Math.round(powerSettings.activityTimeout/60)
-                        return (powerSettings.activityTimeout != 0) ?
-                                    // TRANSLATORS: %1 is the number of minutes
-                                    i18n.tr("After %1 minute",
-                                            "After %1 minutes",
-                                            timeout).arg(timeout) :
-                                    i18n.tr("Never")
-                    }
-                    else {
-                        var timeout = Math.round(powerSettings.idleDelay/60)
-                        return (powerSettings.idleDelay != 0) ?
-                                    // TRANSLATORS: %1 is the number of minutes
-                                    i18n.tr("After %1 minute",
-                                            "After %1 minutes",
-                                            timeout).arg(timeout) :
-                                    i18n.tr("Manually")
-                    }
-                }
+                text: i18n.tr("Locking and unlocking")
                 progression: true
                 onClicked: pageStack.push(Qt.resolvedUrl("PhoneLocking.qml"), {usePowerd: usePowerd, powerSettings: powerSettings})
             }
 
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2015-07-13 12:02:13 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2015-08-21 08:04:36 +0000
@@ -28,7 +28,7 @@
 ItemPage {
     id: root
     objectName: "phoneLockingPage"
-    title: i18n.tr("Phone locking")
+    title: i18n.tr("Locking and unlocking")
 
     property bool usePowerd
     property variant powerSettings