Support non-orientation aware keyboards and other devices.

Fixed a bug with dpad keys on external keyboards being rotated
according to the display orientation by adding a new input device
configuration property called "keyboard.orientationAware".

Added a mechanism for overriding the key layout and key character
map in the input device configuration file using the new
"keyboard.layout" and "keyboard.characterMap" properties.

Also added "trackball.orientationAware", "touch.orientationAware" and
"touch.deviceType" configuration properties.

Rewrote the configuration property reading code in native code
so that it can be used by EventHub and other components.

Added basic support for installable idc, kl, and kcm files
in /data/system/devices.  However, there is no provision for
copying files there yet.

Disabled long-press character pickers on full keyboards so that
key repeating works as expected.

Change-Id: I1bd9f0c3d344421db444e7d271eb09bc8bab4791

2 files changed, 0 insertions, 100 deletions

diff --git a/services/java/com/android/server/InputManager.java b/services/java/com/android/server/InputManager.java
index 4364c04..30b49d3 100644
--- a/services/java/com/android/server/InputManager.java
+++ b/services/java/com/android/server/InputManager.java
@@ -41,7 +41,6 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.ArrayList;
-import java.util.Properties;
 
 /*
  * Wraps the C++ InputManager and provides its callbacks.
@@ -368,11 +367,6 @@ public class InputManager {
         public int height;
     }
     
-    private static final class InputDeviceCalibration {
-        public String[] keys;
-        public String[] values;
-    }
-    
     /*
      * Callbacks from native.
      */
@@ -494,33 +488,6 @@ public class InputManager {
         }
         
         @SuppressWarnings("unused")
-        public InputDeviceCalibration getInputDeviceCalibration(String deviceName) {
-            // Calibration is specified as a sequence of colon-delimited key value pairs.
-            Properties properties = new Properties();
-            File calibrationFile = new File(Environment.getRootDirectory(),
-                    CALIBRATION_DIR_PATH + deviceName + ".idc");
-            if (calibrationFile.exists()) {
-                try {
-                    FileInputStream fis = new FileInputStream(calibrationFile);
-                    properties.load(fis);
-                    fis.close();
-                } catch (IOException ex) {
-                    Slog.w(TAG, "Error reading input device calibration properties for device "
-                            + deviceName + " from " + calibrationFile + ".", ex);
-                }
-            } else {
-                Slog.i(TAG, "No input device calibration properties found for device "
-                        + deviceName + ".");
-                return null;
-            }
-            
-            InputDeviceCalibration calibration = new InputDeviceCalibration();
-            calibration.keys = properties.keySet().toArray(new String[properties.size()]);
-            calibration.values = properties.values().toArray(new String[properties.size()]);
-            return calibration;
-        }
-        
-        @SuppressWarnings("unused")
         public String[] getExcludedDeviceNames() {
             ArrayList<String> names = new ArrayList<String>();
             
diff --git a/services/jni/com_android_server_InputManager.cpp b/services/jni/com_android_server_InputManager.cpp
index 3fd6965..d0760c0 100644
--- a/services/jni/com_android_server_InputManager.cpp
+++ b/services/jni/com_android_server_InputManager.cpp
@@ -57,7 +57,6 @@ static struct {
     jmethodID filterTouchEvents;
     jmethodID filterJumpyTouchEvents;
     jmethodID getVirtualKeyDefinitions;
-    jmethodID getInputDeviceCalibration;
     jmethodID getExcludedDeviceNames;
     jmethodID getMaxEventsPerSecond;
 } gCallbacksClassInfo;
@@ -75,13 +74,6 @@ static struct {
 static struct {
     jclass clazz;
 
-    jfieldID keys;
-    jfieldID values;
-} gInputDeviceCalibrationClassInfo;
-
-static struct {
-    jclass clazz;
-
     jfieldID inputChannel;
     jfieldID name;
     jfieldID layoutParamsFlags;
@@ -186,8 +178,6 @@ public:
     virtual bool filterJumpyTouchEvents();
     virtual void getVirtualKeyDefinitions(const String8& deviceName,
             Vector<VirtualKeyDefinition>& outVirtualKeyDefinitions);
-    virtual void getInputDeviceCalibration(const String8& deviceName,
-            InputDeviceCalibration& outCalibration);
     virtual void getExcludedDeviceNames(Vector<String8>& outExcludedDeviceNames);
 
     /* --- InputDispatcherPolicyInterface implementation --- */
@@ -489,48 +479,6 @@ void NativeInputManager::getVirtualKeyDefinitions(const String8& deviceName,
     }
 }
 
-void NativeInputManager::getInputDeviceCalibration(const String8& deviceName,
-        InputDeviceCalibration& outCalibration) {
-    outCalibration.clear();
-
-    JNIEnv* env = jniEnv();
-
-    jstring deviceNameStr = env->NewStringUTF(deviceName.string());
-    if (! checkAndClearExceptionFromCallback(env, "getInputDeviceCalibration")) {
-        jobject result = env->CallObjectMethod(mCallbacksObj,
-                gCallbacksClassInfo.getInputDeviceCalibration, deviceNameStr);
-        if (! checkAndClearExceptionFromCallback(env, "getInputDeviceCalibration") && result) {
-            jobjectArray keys = jobjectArray(env->GetObjectField(result,
-                    gInputDeviceCalibrationClassInfo.keys));
-            jobjectArray values = jobjectArray(env->GetObjectField(result,
-                    gInputDeviceCalibrationClassInfo.values));
-
-            jsize length = env->GetArrayLength(keys);
-            for (jsize i = 0; i < length; i++) {
-                jstring keyStr = jstring(env->GetObjectArrayElement(keys, i));
-                jstring valueStr = jstring(env->GetObjectArrayElement(values, i));
-
-                const char* keyChars = env->GetStringUTFChars(keyStr, NULL);
-                String8 key(keyChars);
-                env->ReleaseStringUTFChars(keyStr, keyChars);
-
-                const char* valueChars = env->GetStringUTFChars(valueStr, NULL);
-                String8 value(valueChars);
-                env->ReleaseStringUTFChars(valueStr, valueChars);
-
-                outCalibration.addProperty(key, value);
-
-                env->DeleteLocalRef(keyStr);
-                env->DeleteLocalRef(valueStr);
-            }
-            env->DeleteLocalRef(keys);
-            env->DeleteLocalRef(values);
-            env->DeleteLocalRef(result);
-        }
-        env->DeleteLocalRef(deviceNameStr);
-    }
-}
-
 void NativeInputManager::getExcludedDeviceNames(Vector<String8>& outExcludedDeviceNames) {
     outExcludedDeviceNames.clear();
 
@@ -1405,10 +1353,6 @@ int register_android_server_InputManager(JNIEnv* env) {
             "getVirtualKeyDefinitions",
             "(Ljava/lang/String;)[Lcom/android/server/InputManager$VirtualKeyDefinition;");
 
-    GET_METHOD_ID(gCallbacksClassInfo.getInputDeviceCalibration, gCallbacksClassInfo.clazz,
-            "getInputDeviceCalibration",
-            "(Ljava/lang/String;)Lcom/android/server/InputManager$InputDeviceCalibration;");
-
     GET_METHOD_ID(gCallbacksClassInfo.getExcludedDeviceNames, gCallbacksClassInfo.clazz,
             "getExcludedDeviceNames", "()[Ljava/lang/String;");
 
@@ -1435,17 +1379,6 @@ int register_android_server_InputManager(JNIEnv* env) {
     GET_FIELD_ID(gVirtualKeyDefinitionClassInfo.height, gVirtualKeyDefinitionClassInfo.clazz,
             "height", "I");
 
-    // InputDeviceCalibration
-
-    FIND_CLASS(gInputDeviceCalibrationClassInfo.clazz,
-            "com/android/server/InputManager$InputDeviceCalibration");
-
-    GET_FIELD_ID(gInputDeviceCalibrationClassInfo.keys, gInputDeviceCalibrationClassInfo.clazz,
-            "keys", "[Ljava/lang/String;");
-
-    GET_FIELD_ID(gInputDeviceCalibrationClassInfo.values, gInputDeviceCalibrationClassInfo.clazz,
-            "values", "[Ljava/lang/String;");
-
     // InputWindow
 
     FIND_CLASS(gInputWindowClassInfo.clazz, "com/android/server/InputWindow");