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

* commit 'de1d88eb4199160899d227f2c679215e16410c42':
  Dismiss more suggestions panel when suggestions strip is closed
This commit is contained in:
Tadashi G. Takaoka 2012-06-14 14:49:08 -07:00 committed by Android Git Automerger
commit 775d8dcaeb
3 changed files with 3 additions and 2 deletions

View File

@ -159,7 +159,7 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
@Override @Override
public boolean dismissMoreKeysPanel() { public boolean dismissMoreKeysPanel() {
if (mIsDismissing) return false; if (mIsDismissing || mController == null) return false;
mIsDismissing = true; mIsDismissing = true;
final boolean dismissed = mController.dismissMoreKeysPanel(); final boolean dismissed = mController.dismissMoreKeysPanel();
mIsDismissing = false; mIsDismissing = false;

View File

@ -167,7 +167,7 @@ public class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel {
@Override @Override
public boolean dismissMoreKeysPanel() { public boolean dismissMoreKeysPanel() {
if (mIsDismissing) return false; if (mIsDismissing || mController == null) return false;
mIsDismissing = true; mIsDismissing = true;
final boolean dismissed = mController.dismissMoreKeysPanel(); final boolean dismissed = mController.dismissMoreKeysPanel();
mIsDismissing = false; mIsDismissing = false;

View File

@ -884,5 +884,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
super.onDetachedFromWindow(); super.onDetachedFromWindow();
mHandler.cancelAllMessages(); mHandler.cancelAllMessages();
hidePreview(); hidePreview();
dismissMoreSuggestions();
} }
} }