Merge lp:~ogra/ubuntu-system-settings/developer-mode into lp:ubuntu-system-settings

[Oliver Grawert]

* Add DeveloperMode page to "About this device" (see:
  https://wiki.ubuntu.com/AboutThisDevice#developer-mode)

* Enable toggling of the adb usb gadget driver in DeveloperMode page through the dbus-property-service interface

* Add shortcut from DeveloperMode page to Lock screen settings (since the final dev mode will require that you can lock before enabling it)

* Depend on suru-icon-theme since we are using the security alert icon on the Developer Mode page.

* Depend on dbus-property-service on the arches where it is available since we use it in Developer Mode

Initial code for offering developer mode in system-settings accoding to https://wiki.ubuntu.com/AboutThisDevice#developer-mode

[Oliver Grawert (ogra)]

Note that the Lock screen support waits for finished locking support ...

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:823
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1037/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2347
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1926/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/229
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2530
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3561
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3561/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10253
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1615/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2162
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2162/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Inline comments. I didn't check runtime yet.

review: Needs Fixing

[Sebastien Bacher (seb128)]

thanks, I added some review comments about strings/UIs that need to be changed

review: Needs Fixing

[lp:~ogra/ubuntu-system-settings/developer-mode]

824. By Oliver Grawert on 2014-07-23

rename developerModeState to getDeveloperMode and move this function to dbus, rename developerModeToggle to toggleDeveloperMode and use dbus data as base, define dbus path and object in namespace, fix text and text visuals

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:824
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1044/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2398
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1955/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/236
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/236
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/236/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/236
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2564
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3624
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3624/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10301
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1636/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2200/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

The last FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1636/console was caused by a hung test machine. I've triggered a rebuild of this MP.

[lp:~ogra/ubuntu-system-settings/developer-mode]

825. By Oliver Grawert on 2014-07-23

use teh return value after toggling for the clicked state of the switch, drop useless GetProperty call

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:824
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1045/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2402
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/237
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/237
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3629
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3629/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1640
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2204
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2204/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:825
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1046/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2408
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1962
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2575
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3637
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3637/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1643
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2208/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~ogra/ubuntu-system-settings/developer-mode]

826. By Oliver Grawert on 2014-07-24

make sure the lock label is slim emough to get word-wrapped

827. By Oliver Grawert on 2014-07-24

move to a global dbus interface to drop code duplication (thanks mandel for the help!)

828. By Oliver Grawert on 2014-07-24

drop unused QDBusInterface from storageabout.cpp

829. By Oliver Grawert on 2014-07-24

add icon theme (we use the security-alert icon in developer mode, and dbus-property-service to package deps

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:826
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1050/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/242
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2596
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3659
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3659/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10341
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1654
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2226
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2226/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:829
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1051/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2440
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1985
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2235
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2235/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good now and tested on mako

review: Approve

[lp:~ogra/ubuntu-system-settings/developer-mode]

830. By Oliver Grawert on 2014-07-25

only depend on dbus-property-service on arches where it can be used

831. By Oliver Grawert on 2014-07-25

oops, move the deps from build-deps to actual binary deps

=== modified file 'debian/control'
--- debian/control	2014-07-21 14:50:32 +0000
+++ debian/control	2014-07-25 10:52:54 +0000
@@ -47,6 +47,7 @@
          accountsservice,
          accountsservice-ubuntu-touch-schemas,
          bluez (>= 4.36),
+         dbus-property-service [amd64 armhf i386],
          gsettings-desktop-schemas,
          gsettings-ubuntu-touch-schemas (>= 0.0.1+14.04.20140130.1),
          indicator-bluetooth (>> 0.0.6+13.10.20131010),
@@ -61,6 +62,7 @@
          qtdeclarative5-ubuntu-content0.1,
          qtdeclarative5-ubuntu-settings-components (> 0.2),
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 0.1.46+14.04.20131126-0ubuntu1) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles,
+         suru-icon-theme,
          whoopsie-preferences (>= 0.9),
          libsystemsettings1 (= ${binary:Version}),
          system-image-dbus (>= 0.9),

=== modified file 'plugins/about/CMakeLists.txt'
--- plugins/about/CMakeLists.txt	2014-06-23 21:18:17 +0000
+++ plugins/about/CMakeLists.txt	2014-07-25 10:52:54 +0000
@@ -13,13 +13,14 @@
     StorageBar.qml
     StorageItem.qml
     Version.qml
+    DevMode.qml
     fakepkgslist.xml
 )
 
 add_library(UbuntuStorageAboutPanel MODULE
 plugin.cpp storageabout.cpp click.cpp plugin.h storageabout.h click.h
 ${QML_SOURCES}) # So they show up in Qt designer.
-qt5_use_modules(UbuntuStorageAboutPanel Qml Quick)
+qt5_use_modules(UbuntuStorageAboutPanel Qml Quick DBus)
 target_link_libraries(UbuntuStorageAboutPanel
 ${ANDR_PROP_LDFLAGS} ${GLIB_LDFLAGS} ${GIO_LDFLAGS})
 

=== added file 'plugins/about/DevMode.qml'
--- plugins/about/DevMode.qml	1970-01-01 00:00:00 +0000
+++ plugins/about/DevMode.qml	2014-07-25 10:52:54 +0000
@@ -0,0 +1,109 @@
+/*
+ * This file is part of system-settings
+ *
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * Contact: Oliver Grawert <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Oliver Grawert <[e-mail]>
+ *
+ */
+
+import QtQuick 2.0
+import Qt.labs.folderlistmodel 1.0
+import SystemSettings 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.SystemSettings.StorageAbout 1.0
+
+ItemPage {
+    id: versionPage
+    objectName: "versionPage"
+    title: i18n.tr("Developer Mode")
+
+    UbuntuStorageAboutPanel {
+        id: storedInfo
+    }
+
+    Flickable {
+        anchors.fill: parent
+
+        Column {
+            anchors.fill: parent
+
+            ListItem.SingleValue {
+                objectName: "devModeWarningItem"
+                height: warningColumn.childrenRect.height + units.gu(2)
+
+                Column {
+                    anchors.fill: parent
+                    anchors.topMargin: units.gu(1)
+
+                    id: warningColumn
+                    spacing: units.gu(2)
+                    Icon { 
+                        id: warnIcon
+                        width: parent.width/4
+                        height: width
+                        name: "security-alert" 
+                        anchors.horizontalCenter: parent.horizontalCenter
+                    }
+                    Label {
+                        id: warnText
+                        width: parent.width
+                        horizontalAlignment: Text.AlignHCenter
+                        wrapMode: Text.WordWrap
+                        text: i18n.tr("In Developer Mode, anyone can access, " +
+                                       "change or delete anything on this " +
+                                       "phone by connecting it to " +
+                                       "another device.")
+                    }
+                }
+            }
+
+            ListItem.Standard {
+                text: i18n.tr("Developer Mode")
+                control: Switch {
+                    id: devModeSwitch
+                    checked: storedInfo.getDeveloperMode
+                    onClicked: checked = storedInfo.toggleDeveloperMode
+                }
+            }
+
+            ListItem.Divider {}
+
+            ListItem.SingleValue {
+                Label {
+                    id: "lockSecurityLabel"
+                    width: parent.width
+                    anchors.verticalCenter: parent.verticalCenter
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    horizontalAlignment: Text.AlignHCenter
+                    wrapMode: Text.WordWrap
+                    text: i18n.tr("You need a passcode or passphrase set " +
+                                  "to use Developer Mode.")
+                }
+            }
+
+            ListItem.SingleValue {
+                objectName: "lockSecurityItem"
+                text: i18n.tr("Lock security")
+                progression: true
+                onClicked: pageStack.push(Qt.resolvedUrl("../security-privacy/LockSecurity.qml"))
+            }
+        }
+    }
+}
+

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2014-07-17 09:51:33 +0000
+++ plugins/about/PageComponent.qml	2014-07-25 10:52:54 +0000
@@ -179,6 +179,13 @@
                 visible: regulatoryInfo
                 onClicked: pageStack.push(regulatoryInfo.pageComponent)
             }
+
+            ListItem.SingleValue {
+                objectName: "devmodeItem"
+                text: i18n.tr("Developer mode")
+                progression: true
+                onClicked: pageStack.push(Qt.resolvedUrl("DevMode.qml"))
+            }
         }
     }
 }

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2014-07-16 15:30:48 +0000
+++ plugins/about/storageabout.cpp	2014-07-25 10:52:54 +0000
@@ -34,6 +34,12 @@
 #include <QVariant>
 #include "storageabout.h"
 #include <hybris/properties/properties.h>
+#include <QDBusReply>
+
+namespace {
+    const QString PROPERTY_SERVICE_PATH = "/com/canonical/PropertyService";
+    const QString PROPERTY_SERVICE_OBJ = "com.canonical.PropertyService";
+}
 
 struct MeasureData {
     uint *running;
@@ -131,6 +137,10 @@
     QObject(parent),
     m_clickModel(),
     m_clickFilterProxy(&m_clickModel),
+    m_propertyService(new QDBusInterface(PROPERTY_SERVICE_OBJ,
+        PROPERTY_SERVICE_PATH,
+        PROPERTY_SERVICE_OBJ,
+        QDBusConnection::systemBus())),
     m_cancellable(NULL)
 {
 }
@@ -206,6 +216,24 @@
     return m_ubuntuBuildID;
 }
 
+bool StorageAbout::getDeveloperMode()
+{
+    QDBusReply<bool> reply = m_propertyService->call("GetProperty", "adb");
+
+    if (reply.isValid()) {
+        return reply.value();
+    } else {
+        qWarning("devMode: no reply from dbus property service");
+        return false;
+    }
+}
+
+bool StorageAbout::toggleDeveloperMode()
+{
+    m_propertyService->call("SetProperty", "adb", !getDeveloperMode());
+    return getDeveloperMode();
+}
+
 QString StorageAbout::licenseInfo(const QString &subdir) const
 {
 

=== modified file 'plugins/about/storageabout.h'
--- plugins/about/storageabout.h	2014-07-16 15:30:48 +0000
+++ plugins/about/storageabout.h	2014-07-25 10:52:54 +0000
@@ -29,6 +29,7 @@
 #include <QObject>
 #include <QProcess>
 #include <QVariant>
+#include <QDBusInterface>
 
 
 class StorageAbout : public QObject
@@ -86,6 +87,14 @@
                 READ ubuntuBuildID
                 CONSTANT)
 
+    Q_PROPERTY( bool getDeveloperMode
+                READ getDeveloperMode
+                CONSTANT)
+
+    Q_PROPERTY( bool toggleDeveloperMode
+                READ toggleDeveloperMode
+                CONSTANT)
+
 public:
     explicit StorageAbout(QObject *parent = 0);
     ~StorageAbout();
@@ -106,6 +115,8 @@
     Q_INVOKABLE QString formatSize (quint64 size) const;
     Q_INVOKABLE void populateSizes();
     Q_INVOKABLE QString getDevicePath (const QString mount_point);
+    bool getDeveloperMode();
+    bool toggleDeveloperMode();
 
 Q_SIGNALS:
     void sortRoleChanged();
@@ -127,6 +138,8 @@
 
     QMap<QString, QString> m_mounts;
 
+    QScopedPointer<QDBusInterface> m_propertyService;
+
     GCancellable *m_cancellable;
 };