Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32f4ceb2 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Dismiss more suggestions panel when suggestions strip is closed 

This change fixes possible NPE as well.

Bug: 6658028
Change-Id: I8706808d1002b7b0b95930fd9b08568f08645da6
parent 5caaf1b9

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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -884,5 +884,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener, 
        super.onDetachedFromWindow();

        mHandler.cancelAllMessages();

        hidePreview();

        dismissMoreSuggestions();

    }

}