commit a0ac147112b158a58f802700c7d78fa3062630de
author Tadashi G. Takaoka <takaoka@google.com> Mon Jun 23 05:53:46 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jun 21 03:15:09 2014 +0000
tree 181bf7ae48f9998d63dd462a223e9c462317645d
parent 762a356a457326576b33ac31d639ad37fdcd8968
parent a74719c934ceb30d2afb7ae999c909f5c6fd5325

Merge "Fix dismissing more keys panel when hiding keyboard"

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 53628f7..8182593 100644
--- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
@@ -664,10 +664,6 @@
     @Override
     public void onDismissMoreKeysPanel() {
         dimEntireKeyboard(false /* dimmed */);
-        dismissMoreKeysPanel();
-    }
-
-    private void dismissMoreKeysPanel() {
         if (isShowingMoreKeysPanel()) {
             mMoreKeysPanel.removeFromParent();
             mMoreKeysPanel = null;
@@ -733,7 +729,7 @@
     }
 
     public void onHideWindow() {
-        dismissMoreKeysPanel();
+        onDismissMoreKeysPanel();
         final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
         if (accessibilityDelegate != null) {
             accessibilityDelegate.onHideWindow();