From 07a0fd0f5100a0cee978ba07751d63595c9d27ac Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 11 Jan 2011 18:50:40 +0900 Subject: Reset old keyboard state before switching to new keyboard (DO NOT MERGE) Bug: 3322158 Change-Id: I8030202f9b1b491bd9b7acf5ce14b6d8f14db978 --- .../com/android/inputmethod/latin/LatinKeyboardView.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardView.java') diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java index 22d39f7aa..a5476e457 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java @@ -76,14 +76,19 @@ public class LatinKeyboardView extends LatinKeyboardBaseView { } @Override - public void setKeyboard(Keyboard k) { - super.setKeyboard(k); + public void setKeyboard(Keyboard newKeyboard) { + final Keyboard oldKeyboard = getKeyboard(); + if (oldKeyboard instanceof LatinKeyboard) { + // Reset old keyboard state before switching to new keyboard. + ((LatinKeyboard)oldKeyboard).keyReleased(); + } + super.setKeyboard(newKeyboard); // One-seventh of the keyboard width seems like a reasonable threshold - mJumpThresholdSquare = k.getMinWidth() / 7; + mJumpThresholdSquare = newKeyboard.getMinWidth() / 7; mJumpThresholdSquare *= mJumpThresholdSquare; // Assuming there are 4 rows, this is the coordinate of the last row - mLastRowY = (k.getHeight() * 3) / 4; - setKeyboardLocal(k); + mLastRowY = (newKeyboard.getHeight() * 3) / 4; + setKeyboardLocal(newKeyboard); } @Override -- cgit v1.2.3-83-g751a