diff options
Diffstat (limited to 'policy')
3 files changed, 6 insertions, 3 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 18815f5..cd8a065 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -349,7 +349,8 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { } // Set the proper keymap - KeyCharacterMap kmap = KeyCharacterMap.load(event != null ? event.getDeviceId() : 0); + KeyCharacterMap kmap = KeyCharacterMap.load( + event != null ? event.getDeviceId() : KeyCharacterMap.VIRTUAL_KEYBOARD); st.qwertyMode = kmap.getKeyboardType() != KeyCharacterMap.NUMERIC; st.menu.setQwertyMode(st.qwertyMode); } diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 8c857da..cc391d5 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -67,6 +67,7 @@ import android.view.InputChannel; import android.view.InputDevice; import android.view.InputQueue; import android.view.InputHandler; +import android.view.KeyCharacterMap; import android.view.KeyEvent; import android.view.MotionEvent; import android.view.WindowOrientationListener; @@ -2126,7 +2127,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // only do it if the showing app doesn't process the key on its own. long when = whenNanos / 1000000; KeyEvent keyEvent = new KeyEvent(when, when, action, keyCode, 0, 0, - 0, scanCode, flags, InputDevice.SOURCE_KEYBOARD); + KeyCharacterMap.VIRTUAL_KEYBOARD, scanCode, flags, + InputDevice.SOURCE_KEYBOARD); mBroadcastWakeLock.acquire(); mHandler.post(new PassHeadsetKey(keyEvent)); } diff --git a/policy/src/com/android/internal/policy/impl/ShortcutManager.java b/policy/src/com/android/internal/policy/impl/ShortcutManager.java index d86ac44..51377d8 100644 --- a/policy/src/com/android/internal/policy/impl/ShortcutManager.java +++ b/policy/src/com/android/internal/policy/impl/ShortcutManager.java @@ -106,7 +106,7 @@ class ShortcutManager extends ContentObserver { * @return The intent that matches the shortcut, or null if not found. */ public Intent getIntent(int keyCode, int modifiers) { - KeyCharacterMap kcm = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD); + KeyCharacterMap kcm = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD); // First try the exact keycode (with modifiers) int shortcut = kcm.get(keyCode, modifiers); Intent intent = shortcut != 0 ? mShortcutIntents.get(shortcut) : null; |