am a0ac1471: Merge "Fix dismissing more keys panel when hiding keyboard"

* commit 'a0ac147112b158a58f802700c7d78fa3062630de':
  Fix dismissing more keys panel when hiding keyboard
This commit is contained in:
Tadashi G. Takaoka 2014-06-23 05:59:52 +00:00 committed by Android Git Automerger
commit d1f0e40a86

View file

@ -664,10 +664,6 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
@Override @Override
public void onDismissMoreKeysPanel() { public void onDismissMoreKeysPanel() {
dimEntireKeyboard(false /* dimmed */); dimEntireKeyboard(false /* dimmed */);
dismissMoreKeysPanel();
}
private void dismissMoreKeysPanel() {
if (isShowingMoreKeysPanel()) { if (isShowingMoreKeysPanel()) {
mMoreKeysPanel.removeFromParent(); mMoreKeysPanel.removeFromParent();
mMoreKeysPanel = null; mMoreKeysPanel = null;
@ -733,7 +729,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
} }
public void onHideWindow() { public void onHideWindow() {
dismissMoreKeysPanel(); onDismissMoreKeysPanel();
final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate; final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) { if (accessibilityDelegate != null) {
accessibilityDelegate.onHideWindow(); accessibilityDelegate.onHideWindow();