commit cd3d3f22ab6f5dd33b67fc0df58cce6ef46209c5
author Dan Murphy <D.Murphy@motorola.com> Tue Sep 22 11:44:29 2009 -0500
committer Amith Yamasani <yamasani@google.com> Fri Sep 25 14:10:44 2009 -0700
tree ba43dc136080001649173d549f1083d272245633
parent 74711dc7b8164c375908710a764ac9893118e57a

fw/policy/base:Phonewindowmanager: Make vkey button haptics part of global haptic setting

This change ties the virtual key haptics to the global haptics settings

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>

policy/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
old mode 100644
new mode 100755
index 967817c..4234247
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -2184,7 +2184,10 @@
     public void keyFeedbackFromInput(KeyEvent event) {
         if (event.getAction() == KeyEvent.ACTION_DOWN
                 && (event.getFlags()&KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-            mVibrator.vibrate(mVirtualKeyVibePattern, -1);
+            if (Settings.System.getInt(mContext.getContentResolver(),
+                    Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) != 0) {
+                mVibrator.vibrate(mVirtualKeyVibePattern, -1);
+            }
         }
     }