commit 58c1fae507c0b36ee2ff587226f81e19954bf1cb
author Tadashi G. Takaoka <takaoka@google.com> Fri Jun 20 02:17:25 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 20 02:15:46 2014 +0000
tree 56fbcae4787f7b8ff16da83865dde1ef8f95eaea
parent 753d43a29945ac594f7f1ebeedf2a2d0b8744a23
parent b80fb09ff86521bba0d8da4f01fcf54345186972

Merge "Dismiss more keys panel when hiding window"

java/src/com/android/inputmethod/keyboard/MainKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
index f513ac1..e7cfc45 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -666,6 +666,10 @@
     @Override
     public void onDismissMoreKeysPanel() {
         dimEntireKeyboard(false /* dimmed */);
+        dismissMoreKeysPanel();
+    }
+
+    private void dismissMoreKeysPanel() {
         if (isShowingMoreKeysPanel()) {
             mMoreKeysPanel.removeFromParent();
             mMoreKeysPanel = null;
@@ -731,6 +735,7 @@
     }
 
     public void onHideWindow() {
+        dismissMoreKeysPanel();
         final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
         if (accessibilityDelegate != null) {
             accessibilityDelegate.onHideWindow();