Merge "Improve handling of built-in keyboard." into jb-dev

2 files changed, 3 insertions, 32 deletions

diff --git a/include/androidfw/Input.h b/include/androidfw/Input.h
index 044f2bf..601a169 100644
--- a/include/androidfw/Input.h
+++ b/include/androidfw/Input.h
@@ -157,37 +157,6 @@ enum {
 };
 
 /*
- * Describes the basic configuration of input devices that are present.
- */
-struct InputConfiguration {
-    enum {
-        TOUCHSCREEN_UNDEFINED = 0,
-        TOUCHSCREEN_NOTOUCH = 1,
-        TOUCHSCREEN_STYLUS = 2,
-        TOUCHSCREEN_FINGER = 3
-    };
-
-    enum {
-        KEYBOARD_UNDEFINED = 0,
-        KEYBOARD_NOKEYS = 1,
-        KEYBOARD_QWERTY = 2,
-        KEYBOARD_12KEY = 3
-    };
-
-    enum {
-        NAVIGATION_UNDEFINED = 0,
-        NAVIGATION_NONAV = 1,
-        NAVIGATION_DPAD = 2,
-        NAVIGATION_TRACKBALL = 3,
-        NAVIGATION_WHEEL = 4
-    };
-
-    int32_t touchScreen;
-    int32_t keyboard;
-    int32_t navigation;
-};
-
-/*
  * Pointer coordinate data.
  */
 struct PointerCoords {
diff --git a/include/androidfw/InputDevice.h b/include/androidfw/InputDevice.h
index d6ecbf0..1aecf80 100644
--- a/include/androidfw/InputDevice.h
+++ b/include/androidfw/InputDevice.h
@@ -67,7 +67,7 @@ public:
     };
 
     void initialize(int32_t id, int32_t generation, const InputDeviceIdentifier& identifier,
-            const String8& alias);
+            const String8& alias, bool isExternal);
 
     inline int32_t getId() const { return mId; }
     inline int32_t getGeneration() const { return mGeneration; }
@@ -76,6 +76,7 @@ public:
     inline const String8& getDisplayName() const {
         return mAlias.isEmpty() ? mIdentifier.name : mAlias;
     }
+    inline bool isExternal() const { return mIsExternal; }
     inline uint32_t getSources() const { return mSources; }
 
     const MotionRange* getMotionRange(int32_t axis, uint32_t source) const;
@@ -108,6 +109,7 @@ private:
     int32_t mGeneration;
     InputDeviceIdentifier mIdentifier;
     String8 mAlias;
+    bool mIsExternal;
     uint32_t mSources;
     int32_t mKeyboardType;
     sp<KeyCharacterMap> mKeyCharacterMap;