am de1d88eb: am 32f4ceb2: Dismiss more suggestions panel when suggestions strip is closed

* commit 'de1d88eb':
  Dismiss more suggestions panel when suggestions strip is closed

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;

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;

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();
     }
 }