diff options
| author | Dees_Troy <dees_troy@teamw.in> | 2013-04-02 22:22:16 +0200 |
|---|---|---|
| committer | Dees_Troy <dees_troy@teamw.in> | 2013-04-04 20:57:34 +0200 |
| commit | 2673cec07a4740f86438b50cfe1b70b258a9a8c8 (patch) | |
| tree | 3133d98e33eba4fab9760f9a4a54aeac83107119 /gui/keyboard.cpp | |
| parent | Add partition list GUI element (diff) | |
| download | android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar.gz android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar.bz2 android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar.lz android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar.xz android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.tar.zst android_bootable_recovery-2673cec07a4740f86438b50cfe1b70b258a9a8c8.zip | |
Diffstat (limited to '')
| -rw-r--r-- | gui/keyboard.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/gui/keyboard.cpp b/gui/keyboard.cpp index b74ff561a..7b6d006fa 100644 --- a/gui/keyboard.cpp +++ b/gui/keyboard.cpp @@ -38,9 +38,8 @@ #include <string> extern "C" { -#include "../common.h" +#include "../twcommon.h" #include "../minuitwrp/minui.h" -#include "../recovery_ui.h" } #include "rapidxml.hpp" @@ -116,7 +115,7 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) while (keylayout) { if (layoutindex > MAX_KEYBOARD_LAYOUTS) { - LOGE("Too many layouts defined in keyboard.\n"); + LOGERR("Too many layouts defined in keyboard.\n"); return; } @@ -141,7 +140,7 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) while (keyrow) { if (rowindex > MAX_KEYBOARD_ROWS) { - LOGE("Too many rows defined in keyboard.\n"); + LOGERR("Too many rows defined in keyboard.\n"); return; } @@ -158,20 +157,20 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) char keyinfo[255]; if (keyindex > MAX_KEYBOARD_KEYS) { - LOGE("Too many keys defined in a keyboard row.\n"); + LOGERR("Too many keys defined in a keyboard row.\n"); return; } stratt = attr->value(); if (strlen(stratt.c_str()) >= 255) { - LOGE("Key info on layout%i, row%i, key%dd is too long.\n", layoutindex, rowindex, keyindex); + LOGERR("Key info on layout%i, row%i, key%dd is too long.\n", layoutindex, rowindex, keyindex); return; } strcpy(keyinfo, stratt.c_str()); if (strlen(keyinfo) == 0) { - LOGE("No key info on layout%i, row%i, key%dd.\n", layoutindex, rowindex, keyindex); + LOGERR("No key info on layout%i, row%i, key%dd.\n", layoutindex, rowindex, keyindex); return; } @@ -220,7 +219,7 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) // This is an action keyboard_keys[layoutindex - 1][rowindex - 1][keyindex - 1].key = KEYBOARD_ACTION; } else - LOGE("Invalid key info on layout%i, row%i, key%02i.\n", layoutindex, rowindex, keyindex); + LOGERR("Invalid key info on layout%i, row%i, key%02i.\n", layoutindex, rowindex, keyindex); } // PROCESS LONG PRESS INFO IF EXISTS @@ -229,14 +228,14 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) if (attr) { stratt = attr->value(); if (strlen(stratt.c_str()) >= 255) { - LOGE("Key info on layout%i, row%i, key%dd is too long.\n", layoutindex, rowindex, keyindex); + LOGERR("Key info on layout%i, row%i, key%dd is too long.\n", layoutindex, rowindex, keyindex); return; } strcpy(keyinfo, stratt.c_str()); if (strlen(keyinfo) == 0) { - LOGE("No long press info on layout%i, row%i, long%dd.\n", layoutindex, rowindex, keyindex); + LOGERR("No long press info on layout%i, row%i, long%dd.\n", layoutindex, rowindex, keyindex); return; } @@ -282,7 +281,7 @@ GUIKeyboard::GUIKeyboard(xml_node<>* node) // This is an action keyboard_keys[layoutindex - 1][rowindex - 1][keyindex - 1].longpresskey = KEYBOARD_ACTION; } else - LOGE("Invalid long press key info on layout%i, row%i, long%02i.\n", layoutindex, rowindex, keyindex); + LOGERR("Invalid long press key info on layout%i, row%i, long%02i.\n", layoutindex, rowindex, keyindex); } } keyindex++; |