Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 05d7619d: am 3179826b: Fix for 2201954: Disable haptic feedback for hard keys while keyguard is showing

Browse Source 
Merge commit '05d7619df5bc255ef8288bb63989995f4a98b50b' into eclair-mr2-plus-aosp

* commit '05d7619df5bc255ef8288bb63989995f4a98b50b':
  Fix for 2201954: Disable haptic feedback for hard keys while keyguard is showing
This commit is contained in:
Jim Miller
2009-10-29 18:20:04 -07:00
committed by Android Git Automerger
parent 22e6a15297 37286a08cc
commit 2e2cf85db0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -2189,8 +2189,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
public boolean performHapticFeedbackLw(WindowState win, int effectId, boolean always) {
if (!always && Settings.System.getInt(mContext.getContentResolver(),
Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0) {
final boolean hapticsDisabled = Settings.System.getInt(mContext.getContentResolver(),
Settings.System.HAPTIC_FEEDBACK_ENABLED, 0) == 0;
if (!always && (hapticsDisabled || mKeyguardMediator.isShowing())) {
return false;
}
switch (effectId) {