diff options
author | Jeff Brown <jeffbrown@google.com> | 2010-12-02 13:50:46 -0800 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2010-12-02 16:01:32 -0800 |
commit | 9065504a63d6bf37bf621191fda1d1fe4da76ee3 (patch) | |
tree | 500948db3ef54c52fc65f52f4ab4a220e4504009 /include/utils | |
parent | d6a46103bfbed17451abf0fb608d7b778597846c (diff) | |
download | frameworks_base-9065504a63d6bf37bf621191fda1d1fe4da76ee3.zip frameworks_base-9065504a63d6bf37bf621191fda1d1fe4da76ee3.tar.gz frameworks_base-9065504a63d6bf37bf621191fda1d1fe4da76ee3.tar.bz2 |
Improve support for external keyboards.
Use Vendor ID, Product ID and optionally the Version to
locate keymaps and configuration files for external devices.
Moved virtual key definition parsing to native code so that
EventHub can identify touch screens with virtual keys and load
the appropriate key layout file.
Cleaned up a lot of old code in EventHub.
Fixed a regression in ViewRoot's fallback event handling.
Fixed a minor bug in FileMap that caused it to try to munmap
or close invalid handled when released if the attempt to map
the file failed.
Added a couple of new String8 conveniences for formatting strings.
Modified Tokenizer to fall back to open+read when mmap fails since
we can't mmap sysfs files as needed to open the virtual key
definition files in /sys/board_properties/.
Change-Id: I6ca5e5f9547619fd082ddac47e87ce185da69ee6
Diffstat (limited to 'include/utils')
-rw-r--r-- | include/utils/String8.h | 11 | ||||
-rw-r--r-- | include/utils/Tokenizer.h | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/include/utils/String8.h b/include/utils/String8.h index 6abfb06..6b49ff5 100644 --- a/include/utils/String8.h +++ b/include/utils/String8.h @@ -47,7 +47,12 @@ public: explicit String8(const char32_t* o); explicit String8(const char32_t* o, size_t numChars); ~String8(); - + + static inline const String8 empty(); + + static String8 format(const char* fmt, ...) __attribute__((format (printf, 1, 2))); + static String8 formatV(const char* fmt, va_list args); + inline const char* string() const; inline size_t size() const; inline size_t length() const; @@ -229,6 +234,10 @@ inline int strictly_order_type(const String8& lhs, const String8& rhs) return compare_type(lhs, rhs) < 0; } +inline const String8 String8::empty() { + return String8(); +} + inline const char* String8::string() const { return mString; diff --git a/include/utils/Tokenizer.h b/include/utils/Tokenizer.h index 21e58e6..c7db5fb 100644 --- a/include/utils/Tokenizer.h +++ b/include/utils/Tokenizer.h @@ -28,7 +28,7 @@ namespace android { * A simple tokenizer for loading and parsing ASCII text files line by line. */ class Tokenizer { - Tokenizer(const String8& filename, FileMap* fileMap, const char* buffer, size_t length); + Tokenizer(const String8& filename, FileMap* fileMap, char* buffer, size_t length); public: ~Tokenizer(); @@ -110,7 +110,7 @@ private: String8 mFilename; FileMap* mFileMap; - const char* mBuffer; + char* mBuffer; size_t mLength; const char* mCurrent; |