Merge lp:~nick-dedekind/unity8/lp1520548.volume-resync into lp:unity8

[Nick Dedekind]

Use volume-sync action to resync the volume control.

Use volume-sync action to resync the volume control.

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~xavi-garcia-mena/indicator-sound/action-sync-volume/+merge/279097

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Albert Astals Cid (aacid)]

any prerequisite? You're missing the checklist

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2076
http://jenkins.qa.ubuntu.com/job/unity8-ci/6872/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5565
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/287/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1583
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/286
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/285
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/284
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4358
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5579
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5579/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25758
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/104/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/286
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/286/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25757

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6872/rebuild

review: Needs Fixing (continuous-integration)

[Nick Dedekind (nick-dedekind)]

> any prerequisite? You're missing the checklist

added checklis + prereq

[Albert Astals Cid (aacid)]

The code works, but as discussed with Nick, it would be better if there was a property called "syncAction" that would be either null or "volume-sync" that one could listen to so we would not need to hardcode "indicator.volume" nor "volume-sync".

Nick's talking with the backend guys to see if we can make that happen.

[lp:~nick-dedekind/unity8/lp1520548.volume-resync]

2077. By Nick Dedekind on 2015-12-09

more general volume sync

2078. By Nick Dedekind on 2015-12-09

remove unnecessary code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2078
http://jenkins.qa.ubuntu.com/job/unity8-ci/6905/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5679
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/320/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1616
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1511
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/318
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/317
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5693
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5693/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25903
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-xenial-touch/122/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/319
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/319/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25904

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6905/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes

 * Did CI run pass?
Yes for vivid

 * Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
--- qml/Panel/Indicators/MenuItemFactory.qml	2015-10-26 09:59:50 +0000
+++ qml/Panel/Indicators/MenuItemFactory.qml	2015-12-09 17:40:38 +0000
@@ -125,10 +125,12 @@
                 menuModel.loadExtendedAttributes(menuIndex, {'min-value': 'double',
                                                              'max-value': 'double',
                                                              'min-icon': 'icon',
-                                                             'max-icon': 'icon'});
+                                                             'max-icon': 'icon',
+                                                             'x-canonical-sync-action': 'string'});
             }
 
             ServerPropertySynchroniser {
+                id: sliderPropertySync
                 objectName: "sync"
                 syncTimeout: Utils.Constants.indicatorValueTimeout
                 bufferedSyncTimeout: true
@@ -141,6 +143,16 @@
 
                 onSyncTriggered: menuModel.changeState(menuIndex, value)
             }
+
+            UnityMenuAction {
+                model: menuModel
+                index: menuIndex
+                name: getExtendedProperty(extendedData, "xCanonicalSyncAction", "")
+                onStateChanged: {
+                    sliderPropertySync.reset();
+                    sliderPropertySync.updateUserValue();
+                }
+            }
         }
     }