diff options
| author | Justin Koh <justinkoh@google.com> | 2014-05-02 17:28:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 17:28:53 +0000 |
| commit | 9abf0b9031d0ddc33970589d2fb88065d15de712 (patch) | |
| tree | ee26232dbe3ceea1c234968dd9b266f53e1ab28d /policy | |
| parent | 63f728065a7584e3a51bb7b0b58ce8cf0c25390e (diff) | |
| parent | 6015844578dc4d725c7ab3d3004d18ffea446087 (diff) | |
| download | frameworks_base-9abf0b9031d0ddc33970589d2fb88065d15de712.zip frameworks_base-9abf0b9031d0ddc33970589d2fb88065d15de712.tar.gz frameworks_base-9abf0b9031d0ddc33970589d2fb88065d15de712.tar.bz2 | |
am 60158445: Merge "Make global action key timeout configurable." into klp-modular-dev
* commit '6015844578dc4d725c7ab3d3004d18ffea446087':
Make global action key timeout configurable.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index f25d450..72f1e4f 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -668,7 +668,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { private void interceptPowerKeyDown(boolean handled) { mPowerKeyHandled = handled; if (!handled) { - mHandler.postDelayed(mPowerLongPress, ViewConfiguration.getGlobalActionKeyTimeout()); + mHandler.postDelayed(mPowerLongPress, + ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout()); } } @@ -707,9 +708,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (mKeyguardDelegate.isShowing()) { // Double the time it takes to take a screenshot from the keyguard return (long) (KEYGUARD_SCREENSHOT_CHORD_DELAY_MULTIPLIER * - ViewConfiguration.getGlobalActionKeyTimeout()); + ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout()); } - return ViewConfiguration.getGlobalActionKeyTimeout(); + return ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout(); } private void cancelPendingScreenshotChordAction() { |