commit b80fb09ff86521bba0d8da4f01fcf54345186972
author Tadashi G. Takaoka <takaoka@google.com> Thu Jun 19 11:42:32 2014 -0700
committer Tadashi G. Takaoka <takaoka@google.com> Thu Jun 19 11:42:32 2014 -0700
tree f8382d4ba09452dee045575db23d1ae989c43da6
parent f49e9757404a84620f56e4210159c55193587187

Dismiss more keys panel when hiding window

Bug: 15727301
Change-Id: Id7002ecb7f4eea7be3505f6f0235074264418221

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();