Merge lp:~mterry/ubuntu-system-settings/interactive-while-locked into lp:ubuntu-system-settings

[Michael Terry]

Implement the "When locked, allow:" portion of the Security & Privacy panel, so now the user can control whether the launcher and/or indicators are available while locked. (LP: #1358340)

Implement the "When locked, allow:" portion of the Security & Privacy panel, so now the user can control whether the launcher and/or indicators are available while locked. (LP: #1358340)

The spec for this is here: https://wiki.ubuntu.com/SecurityAndPrivacySettings#Locking

And this needs to land and be tested with: https://code.launchpad.net/~mterry/gsettings-ubuntu-touch-schemas/enable-edges-while-locked/+merge/231562

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 - Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 - Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 - Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 - Yes

 * Has a 5 minute exploratory testing run been executed on N4?
 - Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 - I'm a core-dev

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 - Will do

 * What components might get impacted by your changes?
 - Security & Privacy only

 * Have you requested review by the teams of these owning components?
 - Who owns that?

[Sebastien Bacher (seb128)]

Thanks, I've not reviewed it yet, but could you drop the translation template update from there? We don't do it from individual merge requests because it easily leads to conflicts, we rather commit manually an update after doing a landing that change strings

review: Needs Fixing

[Michael Terry (mterry)]

Done, I've reverted the pot changes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:920
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1257/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3830/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2944/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/449
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3694/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5077
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5077/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11811
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2392/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3228
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3228/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:921
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1262/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3857/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2965/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/454
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5104
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11839
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2408/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3249
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3249/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Looks fine to me, thanks!

review: Approve

[Ken VanDine (ken-vandine)]

This no longer merges cleanly now that the lock timeout settings has landed.

review: Needs Fixing

[lp:~mterry/ubuntu-system-settings/interactive-while-locked]

922. By Michael Terry on 2014-08-26

Merge from trunk

[Michael Terry (mterry)]

Merged from trunk!

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:922
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1300/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4056/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3110/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/492
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3899/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5308
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/5308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12139
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2538/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3396
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3396/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks, is there an unity8 side to that? I tried that update (with the corresponding schemas update) and the settings don't seem to work, I can't display the launcher or indicator on the lockscreen when using a password or pin code

review: Needs Information

[Sebastien Bacher (seb128)]

ok, apparently the unity8 side didn't land yet, the changes look fine on principle, comment approving but needs to be tested with unity8 before landing

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-08-21 14:07:14 +0000
+++ debian/control	2014-08-26 13:23:13 +0000
@@ -52,7 +52,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          accountsservice,
-         accountsservice-ubuntu-schemas (>= 0.0.2),
+         accountsservice-ubuntu-schemas (>= 0.0.3),
          bluez (>= 4.36),
          dbus-property-service [amd64 armhf i386],
          gsettings-desktop-schemas,

=== modified file 'plugins/security-privacy/PhoneLocking.qml'
--- plugins/security-privacy/PhoneLocking.qml	2014-08-26 00:54:38 +0000
+++ plugins/security-privacy/PhoneLocking.qml	2014-08-26 13:23:13 +0000
@@ -102,13 +102,34 @@
             visible: showAllUI
         }
 
-    /* TODO: once we know how to do this
-    ListItem.Standard {
-        text: i18n.tr("When locked, allow:")
-    }
-    Launcher,
-    Camera,
-    ...
-    */
+        ListItem.Standard {
+            text: i18n.tr("When locked, allow:")
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Launcher")
+            control: CheckBox {
+                id: launcherCheck
+                enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
+                checked: securityPrivacy.enableLauncherWhileLocked || !enabled
+                onClicked: securityPrivacy.enableLauncherWhileLocked = checked
+            }
+        }
+
+        ListItem.Standard {
+            text: i18n.tr("Notifications and quick settings")
+            control: CheckBox {
+                id: indicatorsCheck
+                enabled: securityPrivacy.securityType !== UbuntuSecurityPrivacyPanel.Swipe
+                checked: securityPrivacy.enableIndicatorsWhileLocked || !enabled
+                onClicked: securityPrivacy.enableIndicatorsWhileLocked = checked
+            }
+        }
+
+        ListItem.Caption {
+            text: securityPrivacy.securityType === UbuntuSecurityPrivacyPanel.Swipe ?
+                  i18n.tr("Turn on lock security to restrict access when the phone is locked.") :
+                  i18n.tr("Other apps and functions will prompt you to unlock.")
+        }
     }
 }

=== modified file 'plugins/security-privacy/securityprivacy.cpp'
--- plugins/security-privacy/securityprivacy.cpp	2014-08-04 19:36:55 +0000
+++ plugins/security-privacy/securityprivacy.cpp	2014-08-26 13:23:13 +0000
@@ -85,13 +85,18 @@
 void SecurityPrivacy::slotChanged(QString interface,
                                   QString property)
 {
-    if (interface != AS_TOUCH_INTERFACE)
-        return;
-
-    if (property == "MessagesWelcomeScreen") {
-        Q_EMIT messagesWelcomeScreenChanged();
-    } else if (property == "StatsWelcomeScreen") {
-        Q_EMIT statsWelcomeScreenChanged();
+    if (interface == AS_INTERFACE) {
+        if (property == "EnableLauncherWhileLocked") {
+            Q_EMIT enableLauncherWhileLockedChanged();
+        } else if (property == "EnableIndicatorsWhileLocked") {
+            Q_EMIT enableIndicatorsWhileLockedChanged();
+        }
+    } else if (interface == AS_TOUCH_INTERFACE) {
+        if (property == "MessagesWelcomeScreen") {
+            Q_EMIT messagesWelcomeScreenChanged();
+        } else if (property == "StatsWelcomeScreen") {
+            Q_EMIT statsWelcomeScreenChanged();
+        }
     }
 }
 
@@ -100,6 +105,8 @@
     // Tell QML so that it refreshes its view of the property
     Q_EMIT messagesWelcomeScreenChanged();
     Q_EMIT statsWelcomeScreenChanged();
+    Q_EMIT enableLauncherWhileLockedChanged();
+    Q_EMIT enableIndicatorsWhileLockedChanged();
 }
 
 bool SecurityPrivacy::getStatsWelcomeScreen()
@@ -136,6 +143,40 @@
     Q_EMIT(messagesWelcomeScreenChanged());
 }
 
+bool SecurityPrivacy::getEnableLauncherWhileLocked()
+{
+    return m_accountsService.getUserProperty(AS_INTERFACE,
+                                             "EnableLauncherWhileLocked").toBool();
+}
+
+void SecurityPrivacy::setEnableLauncherWhileLocked(bool enabled)
+{
+    if (enabled == getEnableLauncherWhileLocked())
+        return;
+
+    m_accountsService.setUserProperty(AS_INTERFACE,
+                                      "EnableLauncherWhileLocked",
+                                      QVariant::fromValue(enabled));
+    Q_EMIT enableLauncherWhileLockedChanged();
+}
+
+bool SecurityPrivacy::getEnableIndicatorsWhileLocked()
+{
+    return m_accountsService.getUserProperty(AS_INTERFACE,
+                                             "EnableIndicatorsWhileLocked").toBool();
+}
+
+void SecurityPrivacy::setEnableIndicatorsWhileLocked(bool enabled)
+{
+    if (enabled == getEnableIndicatorsWhileLocked())
+        return;
+
+    m_accountsService.setUserProperty(AS_INTERFACE,
+                                      "EnableIndicatorsWhileLocked",
+                                      QVariant::fromValue(enabled));
+    Q_EMIT enableIndicatorsWhileLockedChanged();
+}
+
 SecurityPrivacy::SecurityType SecurityPrivacy::getSecurityType()
 {
     if (m_user == NULL || !act_user_is_loaded(m_user))

=== modified file 'plugins/security-privacy/securityprivacy.h'
--- plugins/security-privacy/securityprivacy.h	2014-07-15 22:44:45 +0000
+++ plugins/security-privacy/securityprivacy.h	2014-08-26 13:23:13 +0000
@@ -48,6 +48,14 @@
                 READ getMessagesWelcomeScreen
                 WRITE setMessagesWelcomeScreen
                 NOTIFY messagesWelcomeScreenChanged)
+    Q_PROPERTY (bool enableLauncherWhileLocked
+                READ getEnableLauncherWhileLocked
+                WRITE setEnableLauncherWhileLocked
+                NOTIFY enableLauncherWhileLockedChanged)
+    Q_PROPERTY (bool enableIndicatorsWhileLocked
+                READ getEnableIndicatorsWhileLocked
+                WRITE setEnableIndicatorsWhileLocked
+                NOTIFY enableIndicatorsWhileLockedChanged)
     Q_PROPERTY (SecurityType securityType
                 READ getSecurityType
                 NOTIFY securityTypeChanged)
@@ -66,6 +74,10 @@
     void setStatsWelcomeScreen(bool enabled);
     bool getMessagesWelcomeScreen();
     void setMessagesWelcomeScreen(bool enabled);
+    bool getEnableLauncherWhileLocked();
+    void setEnableLauncherWhileLocked(bool enabled);
+    bool getEnableIndicatorsWhileLocked();
+    void setEnableIndicatorsWhileLocked(bool enabled);
     SecurityType getSecurityType();
 
     // Returns error text, if an error occurred
@@ -78,6 +90,8 @@
 Q_SIGNALS:
     void statsWelcomeScreenChanged();
     void messagesWelcomeScreenChanged();
+    void enableLauncherWhileLockedChanged();
+    void enableIndicatorsWhileLockedChanged();
     void securityTypeChanged();
 
 private: