diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-06-23 05:59:52 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-23 05:59:52 +0000 |
| commit | d1f0e40a863482227a107e22480fe7e06f4ee73b (patch) | |
| tree | 181bf7ae48f9998d63dd462a223e9c462317645d /java/src | |
| parent | 0330292a477144a7be6ac09050441eae55f29157 (diff) | |
| parent | a0ac147112b158a58f802700c7d78fa3062630de (diff) | |
| download | latinime-d1f0e40a863482227a107e22480fe7e06f4ee73b.tar.gz latinime-d1f0e40a863482227a107e22480fe7e06f4ee73b.tar.xz latinime-d1f0e40a863482227a107e22480fe7e06f4ee73b.zip | |
am a0ac1471: Merge "Fix dismissing more keys panel when hiding keyboard"
* commit 'a0ac147112b158a58f802700c7d78fa3062630de':
Fix dismissing more keys panel when hiding keyboard
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/MainKeyboardView.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index 53628f760..81825934f 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -664,10 +664,6 @@ 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; @@ -733,7 +729,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack } public void onHideWindow() { - dismissMoreKeysPanel(); + onDismissMoreKeysPanel(); final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; if (accessibilityDelegate != null) { accessibilityDelegate.onHideWindow(); |