commit 32f4ceb2434b6f204cf8152b406d0f9a642feb73
author Tadashi G. Takaoka <takaoka@google.com> Thu Jun 14 11:54:04 2012 -0700
committer Tadashi G. Takaoka <takaoka@google.com> Thu Jun 14 11:57:43 2012 -0700
tree eb6dbee76eba5fd9c631b445050d31df6393e9c3
parent 5caaf1b9e9720d0d3d461623a34dfe797a4095d0

Dismiss more suggestions panel when suggestions strip is closed

This change fixes possible NPE as well.

Bug: 6658028
Change-Id: I8706808d1002b7b0b95930fd9b08568f08645da6

java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java

diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
index b4fa86d..be7644f 100644
--- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
@@ -159,7 +159,7 @@
 
     @Override
     public boolean dismissMoreKeysPanel() {
-        if (mIsDismissing) return false;
+        if (mIsDismissing || mController == null) return false;
         mIsDismissing = true;
         final boolean dismissed = mController.dismissMoreKeysPanel();
         mIsDismissing = false;

java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java

diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java
index 8a29dcc..19287e3 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 @@
 
     @Override
     public boolean dismissMoreKeysPanel() {
-        if (mIsDismissing) return false;
+        if (mIsDismissing || mController == null) return false;
         mIsDismissing = true;
         final boolean dismissed = mController.dismissMoreKeysPanel();
         mIsDismissing = false;

java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java

diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionsView.java
index 3d593aa..40e54a4 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 @@
         super.onDetachedFromWindow();
         mHandler.cancelAllMessages();
         hidePreview();
+        dismissMoreSuggestions();
     }
 }