aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-06-20 02:17:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-06-20 02:15:46 +0000
commit58c1fae507c0b36ee2ff587226f81e19954bf1cb (patch)
tree56fbcae4787f7b8ff16da83865dde1ef8f95eaea /java
parent753d43a29945ac594f7f1ebeedf2a2d0b8744a23 (diff)
parentb80fb09ff86521bba0d8da4f01fcf54345186972 (diff)
downloadlatinime-58c1fae507c0b36ee2ff587226f81e19954bf1cb.tar.gz
latinime-58c1fae507c0b36ee2ff587226f81e19954bf1cb.tar.xz
latinime-58c1fae507c0b36ee2ff587226f81e19954bf1cb.zip
Merge "Dismiss more keys panel when hiding window"
Diffstat (limited to 'java')
-rw-r--r--java/src/com/android/inputmethod/keyboard/MainKeyboardView.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index f513ac155..e7cfc453f 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -666,6 +666,10 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override
public void onDismissMoreKeysPanel() {
dimEntireKeyboard(false /* dimmed */);
+ dismissMoreKeysPanel();
+ }
+
+ private void dismissMoreKeysPanel() {
if (isShowingMoreKeysPanel()) {
mMoreKeysPanel.removeFromParent();
mMoreKeysPanel = null;
@@ -731,6 +735,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
}
public void onHideWindow() {
+ dismissMoreKeysPanel();
final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) {
accessibilityDelegate.onHideWindow();