1
=== modified file 'src/Ubuntu/Components/1.1/Haptics.qml'
2
--- src/Ubuntu/Components/1.1/Haptics.qml	2015-08-19 08:44:45 +0000
3
+++ src/Ubuntu/Components/1.1/Haptics.qml	2016-08-16 08:33:35 +0000
4
@@ -19,13 +19,10 @@
5
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.1
6
20
20
7
21
Object {
21
Object {
9
22
    readonly property alias enabled: vibra.otherVibrate
22
    readonly property bool enabled: true
10
23
    property alias effect: effect
23
    property alias effect: effect
11
24
24
12
25
    function play(customEffect) {
25
    function play(customEffect) {
13
26
        if (!vibra.otherVibrate) {
14
27
            return;
15
28
        }
16
29
        if (effectData.data) {
26
        if (effectData.data) {
17
30
            // we have a custom effect playing, stop it
27
            // we have a custom effect playing, stop it
18
31
            effect.stop();
28
            effect.stop();
19
@@ -76,15 +73,4 @@
20
76
            }
73
            }
21
77
        }
74
        }
22
78
    }
75
    }
23
79
24
80
    // watch system settings for otherVibrate
25
81
    ServiceProperties {
26
82
        objectName: "system_effect_settings"
27
83
        id: vibra
28
84
        service: "org.freedesktop.Accounts"
29
85
        serviceInterface: "org.freedesktop.Accounts"
30
86
        path: "/org/freedesktop/Accounts"
31
87
        adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
32
88
        property bool otherVibrate: true
33
89
    }
34
90
}
76
}
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-08-16
Tim Peeters		2016-08-16	Approve on 2016-08-16
Review via email: mp+302990@code.launchpad.net
1	=== modified file 'src/Ubuntu/Components/1.1/Haptics.qml'
2	--- src/Ubuntu/Components/1.1/Haptics.qml 2015-08-19 08:44:45 +0000
3	+++ src/Ubuntu/Components/1.1/Haptics.qml 2016-08-16 08:33:35 +0000
4	@@ -19,13 +19,10 @@
5	19	import Ubuntu.Components 1.1	19	import Ubuntu.Components 1.1
6	20		20
7	21	Object {	21	Object {
9	22	readonly property alias enabled: vibra.otherVibrate	22	readonly property bool enabled: true
10	23	property alias effect: effect	23	property alias effect: effect
11	24		24
12	25	function play(customEffect) {	25	function play(customEffect) {
13	26	if (!vibra.otherVibrate) {
14	27	return;
15	28	}
16	29	if (effectData.data) {	26	if (effectData.data) {
17	30	// we have a custom effect playing, stop it	27	// we have a custom effect playing, stop it
18	31	effect.stop();	28	effect.stop();
19	@@ -76,15 +73,4 @@
20	76	}	73	}
21	77	}	74	}
22	78	}	75	}
23	79
24	80	// watch system settings for otherVibrate
25	81	ServiceProperties {
26	82	objectName: "system_effect_settings"
27	83	id: vibra
28	84	service: "org.freedesktop.Accounts"
29	85	serviceInterface: "org.freedesktop.Accounts"
30	86	path: "/org/freedesktop/Accounts"
31	87	adaptorInterface: "com.ubuntu.touch.AccountsService.Sound"
32	88	property bool otherVibrate: true
33	89	}
34	90	}	76	}