diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-06-14 14:46:23 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-06-14 14:46:23 -0700 |
| commit | de1d88eb4199160899d227f2c679215e16410c42 (patch) | |
| tree | 24a0f82cea3776d182797240ba91cc865b9513ae /java/src | |
| parent | d9c702d2ff017452f0264f2be12b6bffd6204e4a (diff) | |
| parent | 32f4ceb2434b6f204cf8152b406d0f9a642feb73 (diff) | |
| download | latinime-de1d88eb4199160899d227f2c679215e16410c42.tar.gz latinime-de1d88eb4199160899d227f2c679215e16410c42.tar.xz latinime-de1d88eb4199160899d227f2c679215e16410c42.zip | |
am 32f4ceb2: Dismiss more suggestions panel when suggestions strip is closed
* commit '32f4ceb2434b6f204cf8152b406d0f9a642feb73':
Dismiss more suggestions panel when suggestions strip is closed
Diffstat (limited to 'java/src')
3 files changed, 3 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java index b4fa86dd5..be7644fb5 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java @@ -159,7 +159,7 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel @Override public boolean dismissMoreKeysPanel() { - if (mIsDismissing) return false; + if (mIsDismissing || mController == null) return false; mIsDismissing = true; final boolean dismissed = mController.dismissMoreKeysPanel(); mIsDismissing = false; diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java index 8a29dcc13..19287e3f3 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java @@ -167,7 +167,7 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { @Override public boolean dismissMoreKeysPanel() { - if (mIsDismissing) return false; + if (mIsDismissing || mController == null) return false; mIsDismissing = true; final boolean dismissed = mController.dismissMoreKeysPanel(); mIsDismissing = false; diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java index 3d593aaa7..40e54a474 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java @@ -884,5 +884,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, super.onDetachedFromWindow(); mHandler.cancelAllMessages(); hidePreview(); + dismissMoreSuggestions(); } } |