summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2009-10-22 11:03:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-22 11:03:39 -0700
commit4c907528d941ff132f5f51ba2d3ac28b2208751f (patch)
tree64268bc31b35989cc5a7c592d3470acb5ac09e07 /services
parent61cf4b906ba09da49c924dc6f9295169c6638ef0 (diff)
parent3d4247ef9541afc88af5ac8d4634f331b20ed5cb (diff)
downloadframeworks_base-4c907528d941ff132f5f51ba2d3ac28b2208751f.zip
frameworks_base-4c907528d941ff132f5f51ba2d3ac28b2208751f.tar.gz
frameworks_base-4c907528d941ff132f5f51ba2d3ac28b2208751f.tar.bz2
am 3d4247ef: am fee0f577: Merge change I99dc6477 into eclair
Merge commit '3d4247ef9541afc88af5ac8d4634f331b20ed5cb' into eclair-mr2-plus-aosp * commit '3d4247ef9541afc88af5ac8d4634f331b20ed5cb': Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/WindowManagerService.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index 9caa386..e743513 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -6227,6 +6227,13 @@ public class WindowManagerService extends IWindowManager.Stub
lt.sample("2 got event ", System.nanoTime() - ev.whenNano);
}
+ if (lastKey != null && !mPolicy.allowKeyRepeat()) {
+ // cancel key repeat at the request of the policy.
+ lastKey = null;
+ downTime = 0;
+ lastKeyTime = curTime;
+ nextKeyTime = curTime + LONG_WAIT;
+ }
try {
if (ev != null) {
curTime = SystemClock.uptimeMillis();