From 4148750ea93e67e5d9aaa15ebc8e3c7a5a5554f1 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 31 Jul 2014 16:48:00 -0500
Subject: configurable haptic mode, part 1 of 3: add haptic feedback mode to
 the GSettings schema and to our Settings object

---
 data/com.canonical.indicator.datetime.gschema.xml.in | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'data')

diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/com.canonical.indicator.datetime.gschema.xml.in
index 62b42c1..4e4acd8 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml.in
+++ b/data/com.canonical.indicator.datetime.gschema.xml.in
@@ -123,6 +123,14 @@
 			  Some timezones can be known by many different cities or names.  This setting describes how the current zone prefers to be named.  Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston).
 			</_description>
 		</key>
+		<key name="alarm-haptic-feedback" type="s">
+			<default>'pulse'</default>
+			<_summary>What kind of haptic feedback, if any, to trigger with an alarm.</_summary>
+			<_description>
+                          What kind of haptic feedback, if any, to trigger with an alarm.
+                          Two modes are currently supported: 'pulse', 'none'.
+			</_description>
+		</key>
 		<key name="alarm-default-sound" type="s">
 			<default>'/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg'</default>
 			<_summary>The alarm's default sound file.</_summary>
-- 
cgit v1.2.3


From 56d881413ffaa171d4367bb968f5454988e2737e Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 31 Jul 2014 17:17:53 -0500
Subject: configurable haptic mode, part 3 of 3: expose the new haptic mode
 setting as a DBus property; sync exporter tests

---
 data/com.canonical.indicator.datetime.AlarmProperties.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'data')

diff --git a/data/com.canonical.indicator.datetime.AlarmProperties.xml b/data/com.canonical.indicator.datetime.AlarmProperties.xml
index d25fa82..9b38af9 100644
--- a/data/com.canonical.indicator.datetime.AlarmProperties.xml
+++ b/data/com.canonical.indicator.datetime.AlarmProperties.xml
@@ -11,6 +11,15 @@
       </doc:doc>
     </property>
 
+    <property name="HapticFeedback" type="s" access="readwrite">
+      <doc:doc>
+        <doc:description>
+          <doc:para>What kind of haptic feedback, if any, to trigger with an alarm.</doc:para>
+          <doc:para>Two modes are currently supported: 'pulse', 'none'.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </property>
+
     <property name="DefaultVolume" type="i" access="readwrite">
       <doc:doc>
         <doc:description>
-- 
cgit v1.2.3