ubuntu-system-settings

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

  1. unhides-sleep-values
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Merged
Approved by: Ken VanDine
Approved revision: 1751
Merged at revision: 1756
Proposed branch: lp:~jonas-drange/ubuntu-system-settings/unhides-sleep-values
Merge into: lp:ubuntu-system-settings
Diff against target: 53 lines (+6/-1)
2 files modified
plugins/security-privacy/PageComponent.qml (+0/-1)
plugins/security-privacy/PhoneLocking.qml (+6/-0)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-system-settings/unhides-sleep-values
Reviewer Review Type Date Requested Status
Ken VanDine Approve
system-apps-ci-bot continuous-integration Approve
Review via email: mp+313434@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

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)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/security-privacy/PageComponent.qml'
2--- plugins/security-privacy/PageComponent.qml 2016-11-21 14:47:12 +0000
3+++ plugins/security-privacy/PageComponent.qml 2016-12-16 13:40:16 +0000
4@@ -182,7 +182,6 @@
5 usePowerd: usePowerd,
6 powerSettings: powerSettings
7 })
8- visible: !isSnap || showAllUI
9 }
10
11 SettingsListItems.SingleValueProgression {
12
13=== modified file 'plugins/security-privacy/PhoneLocking.qml'
14--- plugins/security-privacy/PhoneLocking.qml 2016-07-14 13:51:56 +0000
15+++ plugins/security-privacy/PhoneLocking.qml 2016-12-16 13:40:16 +0000
16@@ -54,6 +54,7 @@
17 anchors.right: parent.right
18
19 SettingsListItems.SingleValueProgression {
20+ visible: !isSnap || showAllUI
21 property string swipe: i18n.ctr("Unlock with swipe", "None")
22 property string passcode: i18n.tr("Passcode")
23 property string passphrase: i18n.tr("Passphrase")
24@@ -124,10 +125,13 @@
25 }
26
27 SettingsItemTitle {
28+ id: lockedPermissions
29 text: i18n.tr("When locked, allow:")
30+ visible: !isSnap || showAllUI
31 }
32
33 SettingsListItems.Standard {
34+ visible: lockedPermissions.visible
35 text: i18n.tr("Launcher")
36 CheckBox {
37 id: launcherCheck
38@@ -141,6 +145,7 @@
39 }
40
41 SettingsListItems.Standard {
42+ visible: lockedPermissions.visible
43 text: i18n.tr("Notifications and quick settings")
44 CheckBox {
45 id: indicatorsCheck
46@@ -154,6 +159,7 @@
47 }
48
49 ListItems.Caption {
50+ visible: lockedPermissions.visible
51 text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ?
52 i18n.tr("Turn on lock security to restrict access when the device is locked.") :
53 i18n.tr("Other apps and functions will prompt you to unlock.")

Subscribers

People subscribed via source and target branches