Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f25b7fd authored by Jeff Brown's avatar Jeff Brown
Browse files

Request key maps from input manager service. 

Instead of each application loading the KeyCharacterMap from
the file system, get them from the input manager service as
part of the InputDevice object.

Refactored InputManager to be a proper singleton instead of
having a bunch of static methods.

InputManager now maintains a cache of all InputDevice objects
that it has loaded.  Currently we never invalidate the cache
which can cause InputDevice to return stale motion ranges if
the device is reconfigured.  This will be fixed in a future change.

Added a fake InputDevice with ID -1 to represent the virtual keyboard.

Change-Id: If7a695839ad0972317a5aab89e9d1e42ace28eb7
parent 54ae1474

api/current.txt

+6 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ package android { 
    field public static final java.lang.String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";

    field public static final java.lang.String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";

    field public static final java.lang.String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";

    field public static final java.lang.String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";

    field public static final java.lang.String SET_ORIENTATION = "android.permission.SET_ORIENTATION";

    field public static final java.lang.String SET_POINTER_SPEED = "android.permission.SET_POINTER_SPEED";

    field public static final deprecated java.lang.String SET_PREFERRED_APPLICATIONS = "android.permission.SET_PREFERRED_APPLICATIONS";
@@ -22268,6 +22269,7 @@ package android.view { 
    method public java.util.List<android.view.InputDevice.MotionRange> getMotionRanges();

    method public java.lang.String getName();

    method public int getSources();

    method public boolean isVirtual();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int KEYBOARD_TYPE_ALPHABETIC = 2; // 0x2
@@ -22327,7 +22329,8 @@ package android.view { 
    method public abstract void onInputQueueDestroyed(android.view.InputQueue);

  }













  public class KeyCharacterMap {













  public class KeyCharacterMap implements android.os.Parcelable {













    method public int describeContents();















    method public static boolean deviceHasKey(int);















    method public static boolean[] deviceHasKeys(int[]);















    method public int get(int, int);









@@ -22342,10 +22345,12 @@ package android.view {













    method public char getNumber(int);















    method public boolean isPrintingKey(int);















    method public static android.view.KeyCharacterMap load(int);













    method public void writeToParcel(android.os.Parcel, int);















    field public static final int ALPHA = 3; // 0x3















    field public static final deprecated int BUILT_IN_KEYBOARD = 0; // 0x0















    field public static final int COMBINING_ACCENT = -2147483648; // 0x80000000















    field public static final int COMBINING_ACCENT_MASK = 2147483647; // 0x7fffffff













    field public static final android.os.Parcelable.Creator CREATOR;















    field public static final int FULL = 4; // 0x4















    field public static final char HEX_INPUT = 61184; // 0xef00 '\uef00'















    field public static final int MODIFIER_BEHAVIOR_CHORDED = 0; // 0x0

























cmds/input/src/com/android/commands/input/Input.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -145,13 +145,15 @@ public class Input {





























    private void injectKeyEvent(KeyEvent event) {















        Log.i(TAG, "InjectKeyEvent: " + event);













        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);













        InputManager.getInstance().injectInputEvent(event,













                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);















    }































    private void injectPointerEvent(MotionEvent event) {















        event.setSource(InputDevice.SOURCE_TOUCHSCREEN);















        Log.i("Input", "InjectPointerEvent: " + event);













        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);













        InputManager.getInstance().injectInputEvent(event,













                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);















    }































    private static final float lerp(float a, float b, float alpha) {

































core/java/android/app/ContextImpl.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -325,9 +325,9 @@ class ContextImpl extends Context {













                    return createDropBoxManager();















                }});





























        registerService(INPUT_SERVICE, new ServiceFetcher() {













                public Object createService(ContextImpl ctx) {













                    return new InputManager(ctx);













        registerService(INPUT_SERVICE, new StaticServiceFetcher() {













                public Object createStaticService() {













                    return InputManager.getInstance();















                }});































        registerService(INPUT_METHOD_SERVICE, new ServiceFetcher() {

































core/java/android/app/Instrumentation.java



+5
−3




























Original line number
Diff line number
Diff line








@@ -883,7 +883,7 @@ public class Instrumentation {













        }















        KeyEvent newEvent = new KeyEvent(downTime, eventTime, action, code, repeatCount, metaState,















                deviceId, scancode, flags | KeyEvent.FLAG_FROM_SYSTEM, source);













        InputManager.injectInputEvent(newEvent,













        InputManager.getInstance().injectInputEvent(newEvent,















                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);















    }















    










@@ -926,7 +926,8 @@ public class Instrumentation {













        if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) == 0) {















            event.setSource(InputDevice.SOURCE_TOUCHSCREEN);















        }













        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);













        InputManager.getInstance().injectInputEvent(event,













                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);















    }































    /**









@@ -945,7 +946,8 @@ public class Instrumentation {













        if ((event.getSource() & InputDevice.SOURCE_CLASS_TRACKBALL) == 0) {















            event.setSource(InputDevice.SOURCE_TRACKBALL);















        }













        InputManager.injectInputEvent(event, InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);













        InputManager.getInstance().injectInputEvent(event,













                InputManager.INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);















    }































    /**

































core/java/android/hardware/input/IInputManager.aidl



+8
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.hardware.input;





























import android.hardware.input.KeyboardLayout;















import android.view.InputDevice;















import android.view.InputEvent;

























@@ -34,4 +35,11 @@ interface IInputManager {













    // Injects an input event into the system.  To inject into windows owned by other















    // applications, the caller must have the INJECT_EVENTS permission.















    boolean injectInputEvent(in InputEvent ev, int mode);



























    // Keyboard layouts configuration.













    KeyboardLayout[] getKeyboardLayouts();













    KeyboardLayout getKeyboardLayout(String keyboardLayoutDescriptor);













    String getKeyboardLayoutForInputDevice(String inputDeviceDescriptor);













    void setKeyboardLayoutForInputDevice(String inputDeviceDescriptor,













            String keyboardLayoutDescriptor);















}