nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

* commit '58c1fae507c0b36ee2ff587226f81e19954bf1cb':
  Dismiss more keys panel when hiding window
main
Tadashi G. Takaoka 2014-06-20 02:20:01 +00:00 committed by Android Git Automerger
parent e906beb469 58c1fae507
commit a553192ab2
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
java/src/com/android/inputmethod/keyboard/MainKeyboardView.java
View File

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