Merge lp:~bfiller/ubuntu-keyboard/haptic-feedback into lp:ubuntu-keyboard

[Bill Filler]

initial support for haptic feedback

initial support for haptic feedback

[Bill Filler (bfiller)]

this works, but will give haptic feedback instead of audio feedback if the audio feedback setting is turned on.

TODO:
- make haptic feedback it's own setting
- make haptic/audio mutually exclusive
- add haptic setting switch to settings panel.

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2014-01-20 00:09:37 +0000
+++ qml/KeyboardContainer.qml	2014-03-03 20:14:14 +0000
@@ -20,6 +20,7 @@
 import "languages/"
 import "keys/"
 import UbuntuKeyboard 1.0
+import QtFeedback 5.0
 
 Item {
     id: panel
@@ -57,6 +58,16 @@
         source: Qt.resolvedUrl("styles/ubuntu/sounds/key_tick2_quiet.wav")
     }
 
+    HapticsEffect {
+        id: pressEffect
+        attackIntensity: 0.0
+        attackTime: 125
+        intensity: 0.5
+        duration: 75
+        fadeTime: 125
+        fadeIntensity: 0.0
+    }
+
     states: [
         State {
             name: "CHARACTERS"

=== modified file 'qml/keys/CharKey.qml'
--- qml/keys/CharKey.qml	2013-11-15 12:31:04 +0000
+++ qml/keys/CharKey.qml	2014-03-03 20:14:14 +0000
@@ -137,9 +137,6 @@
 
         onReleased: {
             if (!extendedKeysShown) {
-                if (maliit_input_method.useAudioFeedback)
-                    audioFeedback.play();
-
                 event_handler.onKeyReleased(valueToSubmit, action);
                 if (!skipAutoCaps)
                     if (panel.activeKeypadState === "SHIFTED" && panel.state === "CHARACTERS")
@@ -148,6 +145,10 @@
         }
         onPressed: {
             event_handler.onKeyPressed(valueToSubmit, action);
+            // TODO, add a setting for haptic feedback
+            if (maliit_input_method.useAudioFeedback)
+                 pressEffect.start()
+                 //audioFeedback.play();
         }
     }