diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt index 11745a1..ab37d44 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/helpers/MyKeyboard.kt @@ -108,7 +108,6 @@ class MyKeyboard { const val EDGE_BOTTOM = 0x08 const val KEYCODE_SHIFT = -1 const val KEYCODE_MODE_CHANGE = -2 - const val KEYCODE_CANCEL = -3 const val KEYCODE_DONE = -4 const val KEYCODE_DELETE = -5 const val KEYCODE_ALT = -6 diff --git a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt index b6ce91f..46a5da5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt +++ b/app/src/main/kotlin/com/simplemobiletools/keyboard/views/MyKeyboardView.kt @@ -898,13 +898,10 @@ class MyKeyboardView @JvmOverloads constructor(context: Context, attrs: Attribut val event = AccessibilityEvent.obtain(eventType) onInitializeAccessibilityEvent(event) val text: String = when (code) { - MyKeyboard.KEYCODE_ALT -> context.getString(R.string.keyboardview_keycode_alt) - MyKeyboard.KEYCODE_CANCEL -> context.getString(R.string.keyboardview_keycode_cancel) - MyKeyboard.KEYCODE_DELETE -> context.getString(R.string.keyboardview_keycode_delete) - MyKeyboard.KEYCODE_DONE -> context.getString(R.string.keyboardview_keycode_done) - MyKeyboard.KEYCODE_MODE_CHANGE -> context.getString(R.string.keyboardview_keycode_mode_change) - MyKeyboard.KEYCODE_SHIFT -> context.getString(R.string.keyboardview_keycode_shift) - '\n'.toInt() -> context.getString(R.string.keyboardview_keycode_enter) + MyKeyboard.KEYCODE_DELETE -> context.getString(R.string.keycode_delete) + MyKeyboard.KEYCODE_DONE -> context.getString(R.string.keycode_enter) + MyKeyboard.KEYCODE_MODE_CHANGE -> context.getString(R.string.keycode_mode_change) + MyKeyboard.KEYCODE_SHIFT -> context.getString(R.string.keycode_shift) else -> code.toChar().toString() } event.text.add(text) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e2f9a1c..c958759 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3,20 +3,8 @@ Keyboard Please enable Simple Keyboard on the next screen, to make it an available keyboard. Press \'Back\' once enabled. Change Keyboard - - - - Alt - - Cancel - - Delete - - Done - - Mode change - - Shift - - Enter + Delete + Change keyboard type + Shift + Enter