diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-08-11 18:47:27 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-08-22 11:10:50 -0700 |
| commit | 72d561178e62b74923cfe3bc0faa59bcb07c57c3 (patch) | |
| tree | 73281ee53a1af78289200a49b9ce9d180c9c59ad /android/skin | |
| parent | 34ddd725dd424c4ad487d223feb0f38f13b10779 (diff) | |
| download | external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.zip external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.tar.gz external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.tar.bz2 | |
Revert "Revert "Merge c80340 from master to r13: Move charmap to hardware properties"..."
This reverts commit cccd28ca5064a7bd14282cd774ee5bb7126d5845.
c80340 add a CL to tools_r13 that broken the build. It was therefore reverted
with cccd28. This revert was merged into tools_r13 but shouldn't have been.
This reverts the revert to put back the CL in master.
Change-Id: I95fcefedb77596cfdf76269f248b2ae80c85c830
Diffstat (limited to 'android/skin')
| -rw-r--r-- | android/skin/keyboard.c | 30 | ||||
| -rw-r--r-- | android/skin/keyboard.h | 5 |
2 files changed, 9 insertions, 26 deletions
diff --git a/android/skin/keyboard.c b/android/skin/keyboard.c index 3ee3366..3371799 100644 --- a/android/skin/keyboard.c +++ b/android/skin/keyboard.c @@ -72,15 +72,6 @@ skin_keyboard_set_keyset( SkinKeyboard* keyboard, SkinKeyset* kset ) } -const char* -skin_keyboard_charmap_name( SkinKeyboard* keyboard ) -{ - if (keyboard && keyboard->charmap) - return keyboard->charmap->name; - - return DEFAULT_ANDROID_CHARMAP; -} - void skin_keyboard_set_rotation( SkinKeyboard* keyboard, SkinRotation rotation ) @@ -539,22 +530,15 @@ skin_keyboard_create_from_charmap_name(const char* charmap_name, } SkinKeyboard* -skin_keyboard_create_from_aconfig( AConfig* aconfig, int use_raw_keys ) +skin_keyboard_create( const char* kcm_file_path, int use_raw_keys ) { - const char* charmap_name = DEFAULT_ANDROID_CHARMAP; - AConfig* node = aconfig_find( aconfig, "keyboard" ); - if (node != NULL) { - charmap_name = aconfig_str(node, "charmap", charmap_name); - } - return skin_keyboard_create_from_charmap_name(charmap_name, use_raw_keys); -} + const char* charmap_name = DEFAULT_ANDROID_CHARMAP; + char cmap_buff[AKEYCHARMAP_NAME_SIZE]; -SkinKeyboard* -skin_keyboard_create_from_kcm( const char* kcm_file_path, int use_raw_keys ) -{ - char charmap_name[AKEYCHARMAP_NAME_SIZE]; - kcm_extract_charmap_name(kcm_file_path, charmap_name, - sizeof(charmap_name)); + if (kcm_file_path != NULL) { + kcm_extract_charmap_name(kcm_file_path, cmap_buff, sizeof cmap_buff); + charmap_name = cmap_buff; + } return skin_keyboard_create_from_charmap_name(charmap_name, use_raw_keys); } diff --git a/android/skin/keyboard.h b/android/skin/keyboard.h index a86b132..1c3b088 100644 --- a/android/skin/keyboard.h +++ b/android/skin/keyboard.h @@ -24,9 +24,8 @@ typedef void (*SkinKeyCommandFunc)( void* opaque, SkinKeyCommand command, int typedef void (*SkinKeyEventFunc)( void* opaque, AndroidKeyCode code, int down ); -extern SkinKeyboard* skin_keyboard_create_from_aconfig( AConfig* aconfig, int use_raw_keys ); - -extern SkinKeyboard* skin_keyboard_create_from_kcm( const char* kcm_file_path, int use_raw_keys ); +/* If kcm_file_path is NULL, create a keyboard using the default built-in qwerty2 charmap */ +extern SkinKeyboard* skin_keyboard_create( const char* kcm_file_path, int use_raw_keys ); extern void skin_keyboard_set_keyset( SkinKeyboard* keyboard, SkinKeyset* kset ); |