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

[Bill Filler]

Adjust values of haptic feedback to make less strong and enable by default

Adjust values of haptic feedback to make less strong and enable by default

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:163
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/383/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/8

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

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'data/schemas/com.canonical.keyboard.maliit.gschema.xml'
--- data/schemas/com.canonical.keyboard.maliit.gschema.xml	2014-04-17 11:16:56 +0000
+++ data/schemas/com.canonical.keyboard.maliit.gschema.xml	2014-05-12 20:29:22 +0000
@@ -34,7 +34,7 @@
     <key name="key-press-haptic-feedback" type="b">
       <summary>Key press haptic feedback</summary>
       <description>Vibrate on key press.</description>
-      <default>false</default>
+      <default>true</default>
     </key>
     <key name="spell-checking" type="b">
       <summary>Spell checking</summary>

=== modified file 'qml/KeyboardContainer.qml'
--- qml/KeyboardContainer.qml	2014-04-08 15:33:05 +0000
+++ qml/KeyboardContainer.qml	2014-05-12 20:29:22 +0000
@@ -61,10 +61,10 @@
     HapticsEffect {
         id: pressEffect
         attackIntensity: 0.0
-        attackTime: 125
-        intensity: 0.5
-        duration: 75
-        fadeTime: 125
+        attackTime: 30
+        intensity: 0.3
+        duration: 25
+        fadeTime: 30
         fadeIntensity: 0.0
     }