Merge lp:~mterry/phablet-tools/tutorial-redesign into lp:phablet-tools

[Michael Terry]

Be more forgiving about current edge-intro state before setting it.

Don't worry about current state of the edge-intro property before setting it.

I'm implementing a redesign of the edge tutorial right now [1]. And it uses a more granular approach to storing how much has been completed.

So if a user runs "phablet-config edges-intro --enable", they probably expect a complete reset of the tutorial state. And since it's no longer a simple binary, it doesn't make sense to check the current state anymore.

This is a companion piece to a dbus-property-service MP that handles the more granular setting. But this can land separately if we want.

[1] https://code.launchpad.net/~mterry/unity8/tutorial-redesign/+merge/271342

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:353
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/467/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/44
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/44

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/467/rebuild

review: Approve (continuous-integration)

[lp:~mterry/phablet-tools/tutorial-redesign]

354. By Michael Terry on 2016-02-22

Merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:354
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/46

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/469/rebuild

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

Tested it, worked fine. Upon enabling, I got a hint for the left edge (launcher swipe), after starting the Dialer app, I got hinted for the bottom edge.

review: Approve

=== modified file 'phablet-config'
--- phablet-config	2015-11-02 15:06:50 +0000
+++ phablet-config	2016-02-22 14:53:32 +0000
@@ -236,24 +236,17 @@
 
 
 def _handle_edges_intro(adb, args):
-    fmt = 'dbus-send --system --print-reply --dest=org.freedesktop.Accounts ' \
-          '/org/freedesktop/Accounts/User32011 %s ' \
-          'string:com.canonical.unity.AccountsService string:demo-edges'
-    getter = fmt % 'org.freedesktop.DBus.Properties.Get'
-
-    enabled = adb.shell(getter).find('true') != -1
-    if args.enable and enabled:
-        print('already enabled')
-    elif not args.enable and not enabled:
-        print('already disabled')
-    else:
-        setter = 'true' if args.enable else 'false'
-        dbus_call = 'dbus-send --system --print-reply ' \
-                    '--dest=com.canonical.PropertyService ' \
-                    '/com/canonical/PropertyService ' \
-                    'com.canonical.PropertyService.SetProperty ' \
-                    'string:edge boolean:%s' % setter
-        adb.shell(dbus_call, False)
+    # Don't try to detect if edges are already enabled or not, since it's
+    # actually a spectrum (some edges might have been completed, others may
+    # not be) and rather than figure out exactly what the current state is,
+    # just set our preferred state.
+    setter = 'true' if args.enable else 'false'
+    dbus_call = 'dbus-send --system --print-reply ' \
+                '--dest=com.canonical.PropertyService ' \
+                '/com/canonical/PropertyService ' \
+                'com.canonical.PropertyService.SetProperty ' \
+                'string:edge boolean:%s' % setter
+    adb.shell(dbus_call, False)
 
 
 def _handle_welcome_wizard(adb, args):