diff options
| author | Iliyan Malchev <malchev@google.com> | 2009-08-06 14:50:57 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2009-08-06 14:52:13 -0700 |
| commit | 75b2aed2769f6287edf2fc6d30d5ba6eaace5efd (patch) | |
| tree | 2a0c9d53a61bfdd41be421d2c97943f2992a944d /services | |
| parent | fc2ebc473bbca6f9e6e30ea5de979c4852f35319 (diff) | |
| download | frameworks_base-75b2aed2769f6287edf2fc6d30d5ba6eaace5efd.zip frameworks_base-75b2aed2769f6287edf2fc6d30d5ba6eaace5efd.tar.gz frameworks_base-75b2aed2769f6287edf2fc6d30d5ba6eaace5efd.tar.bz2 | |
KeyInputQueue: get the name of the virtual-keys file from the input-device name
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/KeyInputQueue.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java index cfb3e35..dc7d22b 100644 --- a/services/java/com/android/server/KeyInputQueue.java +++ b/services/java/com/android/server/KeyInputQueue.java @@ -194,10 +194,10 @@ public abstract class KeyInputQueue { } } - private void readVirtualKeys() { + private void readVirtualKeys(String deviceName) { try { FileInputStream fis = new FileInputStream( - "/sys/board_properties/virtualkeys.synaptics-rmi-touchscreen"); + "/sys/board_properties/virtualkeys." + deviceName); InputStreamReader isr = new InputStreamReader(fis); BufferedReader br = new BufferedReader(isr); String str = br.readLine(); @@ -276,7 +276,6 @@ public abstract class KeyInputQueue { mHapticFeedbackCallback = hapticFeedbackCallback; - readVirtualKeys(); readExcludedDevices(); PowerManager pm = (PowerManager)context.getSystemService( @@ -393,6 +392,9 @@ public abstract class KeyInputQueue { synchronized (mFirst) { di = newInputDevice(ev.deviceId); mDevices.put(ev.deviceId, di); + if ((di.classes & RawInputEvent.CLASS_TOUCHSCREEN) != 0) { + readVirtualKeys(di.name); + } configChanged = true; } } else if (ev.type == RawInputEvent.EV_DEVICE_REMOVED) { |