Merge "Dismiss more keys panel when hiding window"
commit
58c1fae507
|
@ -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();
|
||||||
|
|
Loading…
Reference in New Issue