diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-01-14 17:22:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-14 17:22:53 -0800 |
| commit | c8276990df3ac55c8cbda12919abe247132c96ea (patch) | |
| tree | 4d63d2dd9e4178573888db2591f4a0c11da1a836 /policy | |
| parent | 69d66e00136f67332c992326a7b2eb334eeb32a2 (diff) | |
| parent | b09abc1dd271d0eb4ba4050d8bf9670802a7d0fe (diff) | |
| download | frameworks_base-c8276990df3ac55c8cbda12919abe247132c96ea.zip frameworks_base-c8276990df3ac55c8cbda12919abe247132c96ea.tar.gz frameworks_base-c8276990df3ac55c8cbda12919abe247132c96ea.tar.bz2 | |
Merge "Add volume down as a safe mode key for Stingray." into honeycomb
Diffstat (limited to 'policy')
| -rwxr-xr-x | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index a6037aa..ee1a141 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2550,7 +2550,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { int sState = mWindowManager.getKeycodeState(KeyEvent.KEYCODE_S); int dpadState = mWindowManager.getDPadKeycodeState(KeyEvent.KEYCODE_DPAD_CENTER); int trackballState = mWindowManager.getTrackballScancodeState(BTN_MOUSE); - mSafeMode = menuState > 0 || sState > 0 || dpadState > 0 || trackballState > 0; + int volumeDownState = mWindowManager.getKeycodeState(KeyEvent.KEYCODE_VOLUME_DOWN); + mSafeMode = menuState > 0 || sState > 0 || dpadState > 0 || trackballState > 0 + || volumeDownState > 0; performHapticFeedbackLw(null, mSafeMode ? HapticFeedbackConstants.SAFE_MODE_ENABLED : HapticFeedbackConstants.SAFE_MODE_DISABLED, true); |