Merge lp:~jonas-drange/ubuntu-system-settings/unhides-sleep-values into lp:ubuntu-system-settings

[Jonas G. Drange]

unhides the "phone locking" screen, but only show working items for a snap system

[system-apps-ci-bot (system-apps-ci-bot)]

PASSED: Continuous integration, rev:1751
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/282/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/2200
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/569
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/2203
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=zesty/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=zesty/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/2030/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2030
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=zesty/2030/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/282/rebuild

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

=== modified file 'plugins/security-privacy/PageComponent.qml'
--- plugins/security-privacy/PageComponent.qml	2016-11-21 14:47:12 +0000
+++ plugins/security-privacy/PageComponent.qml	2016-12-16 13:40:16 +0000
@@ -182,7 +182,6 @@
                     usePowerd: usePowerd,
                     powerSettings: powerSettings
                 })
-                visible: !isSnap || showAllUI
             }
 
             SettingsListItems.SingleValueProgression {
 
=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2016-07-14 13:51:56 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2016-12-16 13:40:16 +0000
@@ -54,6 +54,7 @@
             anchors.right: parent.right
 
             SettingsListItems.SingleValueProgression {
+                visible: !isSnap || showAllUI
                 property string swipe: i18n.ctr("Unlock with swipe", "None")
                 property string passcode: i18n.tr("Passcode")
                 property string passphrase: i18n.tr("Passphrase")
@@ -124,10 +125,13 @@
             }
 
             SettingsItemTitle {
+                id: lockedPermissions
                 text: i18n.tr("When locked, allow:")
+                visible: !isSnap || showAllUI
             }
 
             SettingsListItems.Standard {
+                visible: lockedPermissions.visible
                 text: i18n.tr("Launcher")
                 CheckBox {
                     id: launcherCheck
@@ -141,6 +145,7 @@
             }
 
             SettingsListItems.Standard {
+                visible: lockedPermissions.visible
                 text: i18n.tr("Notifications and quick settings")
                  CheckBox {
                     id: indicatorsCheck
@@ -154,6 +159,7 @@
             }
 
             ListItems.Caption {
+                visible: lockedPermissions.visible
                 text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ?
                       i18n.tr("Turn on lock security to restrict access when the device is locked.") :
                       i18n.tr("Other apps and functions will prompt you to unlock.")