Ensure the ShortcutManager uses the correct key character map.

The ShortcutManager used to only receive the key code of the key event
that triggered the shortcut.  This change now provides the shortcut
manager with the whole key event so it can look up the associated
character using the correct key character map.

To make this more efficient, added a mechanism for recycling
key events.  At the moment it is only used by key events owned by the
system process, since clients of the existing API (such as Views)
might continue to hold on to key events after dispatch has finished so
they would break if the key event were recycled by the framework.

Deprecated KeyCharacterMap.BUILT_IN_KEYBOARD.

Change-Id: I4313725dd63f2be01c350c005a41c7fde9bc67e8

2 files changed, 26 insertions, 28 deletions

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 1373627..c528745 100755
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1215,11 +1215,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
 
     /** {@inheritDoc} */
     @Override
-    public boolean interceptKeyBeforeDispatching(WindowState win, int action, int flags,
-            int keyCode, int scanCode, int metaState, int repeatCount, int policyFlags) {
+    public boolean interceptKeyBeforeDispatching(WindowState win, KeyEvent event, int policyFlags) {
         final boolean keyguardOn = keyguardOn();
-        final boolean down = (action == KeyEvent.ACTION_DOWN);
-        final boolean canceled = ((flags & KeyEvent.FLAG_CANCELED) != 0);
+        final int keyCode = event.getKeyCode();
+        final int repeatCount = event.getRepeatCount();
+        final int metaState = event.getMetaState();
+        final boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
+        final boolean canceled = event.isCanceled();
 
         if (false) {
             Log.d(TAG, "interceptKeyTi keyCode=" + keyCode + " down=" + down + " repeatCount="
@@ -1348,7 +1350,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         // Shortcuts are invoked through Search+key, so intercept those here
         if (mSearchKeyPressed) {
             if (down && repeatCount == 0 && !keyguardOn) {
-                Intent shortcutIntent = mShortcutManager.getIntent(keyCode, metaState);
+                Intent shortcutIntent = mShortcutManager.getIntent(event);
                 if (shortcutIntent != null) {
                     shortcutIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     mContext.startActivity(shortcutIntent);
@@ -1368,13 +1370,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
 
     /** {@inheritDoc} */
     @Override
-    public boolean dispatchUnhandledKey(WindowState win, int action, int flags,
-            int keyCode, int scanCode, int metaState, int repeatCount, int policyFlags) {
+    public boolean dispatchUnhandledKey(WindowState win, KeyEvent event, int policyFlags) {
         if (false) {
-            Slog.d(TAG, "Unhandled key: win=" + win + ", action=" + action
-                    + ", flags=" + flags + ", keyCode=" + keyCode
-                    + ", scanCode=" + scanCode + ", metaState=" + metaState
-                    + ", repeatCount=" + repeatCount + ", policyFlags=" + policyFlags);
+            Slog.d(TAG, "Unhandled key: win=" + win + ", action=" + event.getAction()
+                    + ", flags=" + event.getFlags()
+                    + ", keyCode=" + event.getKeyCode()
+                    + ", scanCode=" + event.getScanCode()
+                    + ", metaState=" + event.getMetaState()
+                    + ", repeatCount=" + event.getRepeatCount()
+                    + ", policyFlags=" + policyFlags);
         }
         return false;
     }
@@ -1970,10 +1974,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
 
     /** {@inheritDoc} */
     @Override
-    public int interceptKeyBeforeQueueing(long whenNanos, int action, int flags,
-            int keyCode, int scanCode, int policyFlags, boolean isScreenOn) {
-        final boolean down = action == KeyEvent.ACTION_DOWN;
-        final boolean canceled = (flags & KeyEvent.FLAG_CANCELED) != 0;
+    public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags, boolean isScreenOn) {
+        final boolean down = event.getAction() == KeyEvent.ACTION_DOWN;
+        final boolean canceled = event.isCanceled();
+        final int keyCode = event.getKeyCode();
 
         final boolean isInjected = (policyFlags & WindowManagerPolicy.FLAG_INJECTED) != 0;
 
@@ -2164,12 +2168,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                     // Only do this if we would otherwise not pass it to the user. In that
                     // case, the PhoneWindow class will do the same thing, except it will
                     // 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,
-                            KeyCharacterMap.VIRTUAL_KEYBOARD, scanCode, flags,
-                            InputDevice.SOURCE_KEYBOARD);
                     mBroadcastWakeLock.acquire();
-                    mHandler.post(new PassHeadsetKey(keyEvent));
+                    mHandler.post(new PassHeadsetKey(new KeyEvent(event)));
                 }
                 break;
             }
diff --git a/policy/src/com/android/internal/policy/impl/ShortcutManager.java b/policy/src/com/android/internal/policy/impl/ShortcutManager.java
index 51377d8..fc66a20 100644
--- a/policy/src/com/android/internal/policy/impl/ShortcutManager.java
+++ b/policy/src/com/android/internal/policy/impl/ShortcutManager.java
@@ -25,6 +25,7 @@ import android.provider.Settings;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
 
 import java.net.URISyntaxException;
 
@@ -100,20 +101,17 @@ class ShortcutManager extends ContentObserver {
      * This will first try an exact match (with modifiers), and then try a
      * match without modifiers (primary character on a key).
      * 
-     * @param keyCode The keycode of the key pushed.
-     * @param modifiers The modifiers without any that are used for chording
-     *            to invoke a shortcut.
+     * @param event The key event of the key that was pressed.
      * @return The intent that matches the shortcut, or null if not found.
      */
-    public Intent getIntent(int keyCode, int modifiers) {
-        KeyCharacterMap kcm = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
+    public Intent getIntent(KeyEvent event) {
         // First try the exact keycode (with modifiers)
-        int shortcut = kcm.get(keyCode, modifiers);
+        int shortcut = event.getUnicodeChar();
         Intent intent = shortcut != 0 ? mShortcutIntents.get(shortcut) : null; 
         if (intent != null) return intent;
-        
+
         // Next try the keycode without modifiers (the primary character on that key)
-        shortcut = Character.toLowerCase(kcm.get(keyCode, 0));
+        shortcut = Character.toLowerCase(event.getUnicodeChar(0));
         return shortcut != 0 ? mShortcutIntents.get(shortcut) : null;
     }