diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-04-23 16:12:32 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-04-23 16:12:32 -0700 |
| commit | 8bca94ad83f82682bc15df29dc25377fe43da17f (patch) | |
| tree | 04e78f028b7a6b8c8a9e9e66d0aa4d22ed97f073 /libs/androidfw/KeyCharacterMap.cpp | |
| parent | fd6a5245ccb0294dada070444d9d9c6be752e668 (diff) | |
More work on international keyboards.
Changed the English US keymaps to implement a strict US key map
with no additional ALT functions.
Fixed a bug copying the alias in the InputDevice copy constructor.
Added support for end of line comments in KCM and KL files.
Added the German keyboard layout.
Sorted the keys in the keyboard layout files by physical arrangement
to make it easier to maintain them.
Bug: 6110399
Change-Id: If44d83de5b98f2bf0016cbb8e12264387b286aaa
Diffstat (limited to 'libs/androidfw/KeyCharacterMap.cpp')
| -rw-r--r-- | libs/androidfw/KeyCharacterMap.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/androidfw/KeyCharacterMap.cpp b/libs/androidfw/KeyCharacterMap.cpp index 2dc7507f352d..36cb6e11b210 100644 --- a/libs/androidfw/KeyCharacterMap.cpp +++ b/libs/androidfw/KeyCharacterMap.cpp @@ -713,8 +713,8 @@ status_t KeyCharacterMap::Parser::parse() { } mTokenizer->skipDelimiters(WHITESPACE); - if (!mTokenizer->isEol()) { - ALOGE("%s: Expected end of line, got '%s'.", + if (!mTokenizer->isEol() && mTokenizer->peekChar() != '#') { + ALOGE("%s: Expected end of line or trailing comment, got '%s'.", mTokenizer->getLocation().string(), mTokenizer->peekRemainderOfLine().string()); return BAD_VALUE; @@ -973,7 +973,7 @@ status_t KeyCharacterMap::Parser::parseKeyProperty() { } mTokenizer->skipDelimiters(WHITESPACE); - } while (!mTokenizer->isEol()); + } while (!mTokenizer->isEol() && mTokenizer->peekChar() != '#'); // Add the behavior. for (size_t i = 0; i < properties.size(); i++) { |