am 58c1fae5: Merge "Dismiss more keys panel when hiding window"

* commit '58c1fae507c0b36ee2ff587226f81e19954bf1cb':
  Dismiss more keys panel when hiding window
This commit is contained in:
Tadashi G. Takaoka 2014-06-20 02:20:01 +00:00 committed by Android Git Automerger
commit a553192ab2

View file

@ -666,6 +666,10 @@ 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;
@ -731,6 +735,7 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack
}
public void onHideWindow() {
dismissMoreKeysPanel();
final MainKeyboardAccessibilityDelegate accessibilityDelegate = mAccessibilityDelegate;
if (accessibilityDelegate != null) {
accessibilityDelegate.onHideWindow();